Updated Group features
Conflict resolved
Merge branch 'master' of https://github.com/fenghuo/FaceCalendar

Conflicts:
	db/faceCalendar.11.18.sql