Merge remote-tracking branch 'upstream/master'
fixed road distance setting
Merge remote-tracking branch 'merge/master'
interesting values
slight fixes all around
fixed csvdumper, sorry
add exception to defparams
Nothing special
Merge branch 'master' of https://github.com/paivola/mapserver
Merge branch 'master' of https://github.com/kokosp/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/models/PopCenter.java
	src/main/java/fi/paivola/mapserver/models/RoadModel.java
fuck dots
some constant multiplier purely mathematical fixes
Proper flooding should now occur if the weather allows it
...maybe this time...
hypercubes
testcases
comments
Merge remote-tracking branch 'food/master'
bubblegum