aftershave
Merge remote-tracking branch 'water/master'
aftershave
Merge branch 'master' of github.com:JuhaniImberg/mapserver-merge
Merge remote-tracking branch 'merge/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/resources/settings.json