Merge remote-tracking branch 'merge/master'
can no longer take negative amounts of supplies
Merge branch 'master' of https://github.com/kokosp/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/models/PopCenter.java