Merge branch 'master' into feature/simon
Disabling map controls
Merge pull request #13 from cts12/feature/simon

Feature/simon