Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Game.py
	Game/Player.py
	Game/Unit.py