Map view in progress
Merge branch 'map' into develop