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

Conflicts:
	css/style.css
	view/adminMenu.php