changed to display map and chat app
Merge branch 'develop' into staging
removed all auto created tags
Merge branch 'develop' into staging