recommit Javascript/Jquery changes because of conflicts
Merge branch 'master' of
https://github.com/Blechfalke/CityBuilderProd.git

Conflicts:
	index.php