Local Commit.
Merge branch 'master' into AndrewMOE
Animation working.