cleanup
Merge branch 'master' of https://github.com/josulliv101/campusmap

Conflicts:
	app/scripts/views/panels/base.js