Merge remote-tracking branch 'origin/master'

Conflicts:
	client/js/game/game.js