Added movement interpolation
Merge branch 'master' into feature

Conflicts:
	constants.js