fixed issues where settlements could not be placed on water-border tiles
Merge branch 'master' of https://github.com/jjacobskind/settlers