Changed name of generated jar
Merge branch 'master' of https://github.com/johan-martenson/settlers

Merge commit. Only local change is renaming of the artifact to settlers-model
Updated so that the tests on roads crossing and roads sharing a common segment pass