Merge branch 'development' into plot_google_map
Added latest version of plot google map
Merge branch 'plot_google_map' into development
pulled from maz and resolved conflict