Small fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/The_Game.sdf