getting maps section to flow properly
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop

Conflicts:
	src/assets/js/app/views/location/LocationImageSetView.js