Merge branch 'master' of github.com:alulaq2/ion-ux
Merge branch 'master' of https://github.com/ooici/ion-ux
Initial commit of Google Map work
Added Spatial open on click of drawing type
Merge branch 'new-architecture' into map-work

Conflicts:
	templates/spatial.html

merge fix
Map updates. Hooked in search inputs and drawing tool selectors
I dunno what this is.
Merged something.
Merge branch 'map-work' of github.com:alulaq2/ion-ux into map-work
Merge branch 'map-work' into new-architecture