Merge "add components necessary for bootanim to animation class" into oc-dev