Added Hongyuan's group portion
Merge branch 'master' of https://github.com/fenghuo/FaceCalendar
Added Group functionality
Added profile && signup new features
Auto-merge conflicts resolved
Merge branch 'master' of https://github.com/fenghuo/FaceCalendar

Conflicts:
	app/models/Event_model.rb
	app/models/User_model.rb