Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/controller/Game.class