- Changed some settings, uliuli
Merge branch 'development' of github.com:alodnal/HexaConquest into development

Conflicts:
	Assets/Prefabs/Overlays/OverlayEnemyTile.prefab
	Assets/Prefabs/Overlays/OverlayFriendlyTown.prefab
	Assets/Scenes/Main.unity
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/ProjectSettings.asset