towns now harvest from connected fields
roads should now get flooded and rained on
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'merge/master'
Merge remote-tracking branch 'jaakaappi/master'
Merge remote-tracking branch 'kivi/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/resources/settings.json
Merge remote-tracking branch 'merge/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/resources/settings.json
popcenter can now have people eat their food
Merge remote-tracking branch 'merge/master'
fixed registration of extension models
Merge branch 'master' of https://github.com/kokosp/mapserver
Population code event juggling
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge