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

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

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java