Merge branch 'gmaps_api_key_1.6.1' of https://github.com/uw-it-aca/spacescout_web
Merge branch 'master' of https://github.com/uw-it-aca/spacescout_web
List of rooms resets after clicking anywhere on the map that's not a pin.
Merge branch 'pinsout'

Conflicts:
	static/js/search.js