Fix JSLint errors
Merge branch '154-fix-animation' into next