Maailma lisätty
Paranneltu maailma
bug fixing
Pieniä muutoksia, ei testattu.
Fixes to the SM mess
Muutoksia getAidiin ja settingMasteriin, lisää tulee
Jukkeri sääti koodia, nyt sen pitäisi toimiakkin
added port towns that take development aid
Merge remote-tracking branch 'merge/master'
"better" timestamp
made alterations to math that should make small villages request more surplus than big ones
Merge remote-tracking branch 'merge/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/models/PopCenter.java
testcase.py: template and datafile customizable
fix
Merge remote-tracking branch 'mapserver/master'
power merge
redurant readme
merge water
merge stability
Merge remote-tracking branch 'logistics/master'