shipments buffed with multiple trucks and less lazy drivers
merged with population
Merge remote-tracking branch 'population/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/java/fi/paivola/population/PopulationExtender.java
Merge remote-tracking branch 'merge/master'
Merge branch 'master' of https://github.com/kokosp/mapserver

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