Starting map
First draft of map
Bug fixes for map
Merge branch 'develop' into map-gui
Working release of map gui