Map completely working
Merge branch 'master' into SingleMapInitiative
Fixed conflicts and settings hides
Merge pull request #55 from mdidier9/SingleMapInitiative

Single map initiative