Added map changes for #1011
Added map changes for #1017
Removed nothing special from carlin boat
Merge pull request #1023 from EPuncker/master

Map changes