Merging GUI
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameEngine/commands.txt