Merge branch 'master' of https://github.com/paivola/mapserver
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
Wrapped and hid debug-output from population. Fixed a bug in mortalities