Log + game_dir + gameManager
Merge remote-tracking branch 'origin/jonas' into jonas

Conflicts:
	Revenge_of_the_Penguins/aicontrol.cpp