- changed method for placing city
Merge branch 'master' of https://github.com/Elejdor/wiktorPrototype

Conflicts:
	Assets/General/GameController.cs
	Assets/General/ValidationModule.cs
	Assets/Player/PlayerStates.cs