fixed animation transition times
Merge remote-tracking branch 'origin/sean_animationsMaster'