Changed alert to notify
merging 2 different commits
changes in CG.js
Merge branch 'master' of https://github.com/campusgrids/CampusGrids

Conflicts:
	js/CG.js