group feature version 1
Merge branch 'master' of https://github.com/tfly2013/SMDProject.git

Conflicts:
	app/controllers/societies_controller.rb