merge changed from JR Fork
Merge branch 'johnrosswvsu-feature-google-map-controls-17' into develop
Merged