fixed animation bug
Merge branch 'master' into TouchScreen