naming conventions
Merge branch 'master' of https://github.com/Blechfalke/CityBuilderProd

Conflicts:
	controller/class.GameController.php