Updated to work with maven 3
Merge branch 'master' of https://github.com/johan-martenson/settlers

Merge with remote. Only remote change is removal of Flag::retrieveNextCargo()
Added stricter handling for areas around buildings, where flags can be built and where houses can be built.