Added  functions in profile
Conflicts resolved

Conflicts:
	app/models/Event_model.rb~
	app/models/Groups_model.rb~