some conflicts ...
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
Merge branch 'MergingError' of
https://github.com/EvelynHischier/CityBuilder into MergingError

Conflicts:
	ClientSide/view/DivGame.php