updated database, added group notifications
Merge branch 'master' of https://github.com/11pm/cri

Conflicts:
	Cri/src/main/webapp/templates/group.html
	Cri/src/main/webapp/templates/login.html