map testing
Merge remote-tracking branch 'origin/staging' into axs/maps_branch
merging map work into project
Make maps more mobile friendly by disablying dragging and zooming
Merge branch 'axs/maps_branch' into staging

* axs/maps_branch:
  Make maps more mobile friendly by disablying dragging and zooming
  merging map work into project
  map testing