Merge pull request #1 from malmuki/dev

Dev
Merge pull request #2 from malmuki/dev

Dev
Merge pull request #3 from malmuki/dev

Dev
Merge pull request #4 from malmuki/dev

map boundaries
Merge pull request #21 from malmuki/dev

Dev
Merge pull request #27 from malmuki/devMovePath

Dev move path
Revert "Dev move path"
Merge pull request #28 from malmuki/revert-27-devMovePath

Revert "Dev move path"
Merge branch 'master' into dev