Add browse link in popup, add location.isSchool, remove google in location-marker
Update location naming
Merge pull request #242 from CloudNiner/topic/bugfixes

Add browse link in popup, add location.isSchool, remove google in loc-marker
Merge branch 'staging' into topic/filters

Conflicts:
	python/ecep/portal/static/js/cel/pages/browse.js