twk
Merge branch 'master' of https://github.com/josulliv101/campusmapbuilder

Conflicts:
	app/scripts/views/searchbox/searchbox_panel_admin-map-edit.js
	app/scripts/views/searchbox/searchbox_panel_admin-maps.js
resolve