remove redundant condition
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/anm/animation/element.js
Merge remote-tracking branch 'origin/develop' into develop
fix time calculation for modifiers, messed up before