universities layer
Merge branch 'master' of https://github.com/dughetti/GIS-MDP

Conflicts:
	public/assets/js/app.js