Conflicted data 
displaying a popup while clicking on fertile button (zone)
Merge branch 'MergingError' of
https://github.com/EvelynHischier/CityBuilder into MergingError

Conflicts:
	ClientSide/javaScripts/app.js