Changed event handling necessesitated - previously 'zone' was stored on each marker as the full object.
The leaflet map will now send .close to the event source when the 'state' (ui-view) is changed.
folding in newest Galaxy UI work
removed config folder.
added imports back into index.html - merge now working properly.
updated the d3 / crossfilter control to fix an issue with proper Quarter filtering.
added some stuff for testing.
Merge remote-tracking branch 'origin/gisProductionProto' into gisProductionProto-POSTfixes

Conflicts:
	app/js/controllers.js
	bower.json
	index.html
	views/home/comps/mainMenuAccordian.html

hopefully this works, I'm trying to merge upstream