keep the rubbish out, please
Merge branch 'master' of github.com:JuhaniImberg/mapserver-merge
Merge branch 'master' of https://github.com/kokosp/mapserver
Added a sanity check for population negativity
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge
Removed "fail-fast" -code
Population is now nicely reacting to famine.
Merge branch 'master' of https://github.com/kokosp/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/models/PopCenter.java
Removed TestCase.java since it's not used.
shipments buffed with multiple trucks and less lazy drivers