leaflet
merge
Merge branch 'master' of https://github.com/josulliv101/campusmaps-dev

Conflicts:
	app/scripts/services/map/leaflet.js