university typeahead work
Merge branch 'master' of https://github.com/mvonahn/CollegeCommTracker into work

Conflicts:
	app/index.html
	app/js/controllers.js
	app/partials/commDetail.html
	ci/application/controllers/user.php
type label changes
adding label to table