Removed animations for now.
Merge branch 'Cameron-Work'
Merge branch 'master' into AimeWorkingBranch