commit all
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/js/animation.js
	client/js/game.js