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

Conflicts:
	app/controllers/societies_controller.rb
Revert "add slider"

This reverts commit 0e4408f6e62d214bf0ae6b47a18a26966ad76b6f.
Revert "add slider"

This reverts commit 0e4408f6e62d214bf0ae6b47a18a26966ad76b6f.
Final Merged
Merge remote-tracking branch 'origin/master' into society

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/views/events/_form.html.erb
Merge commit '035b5ac8657587e8d8942c5b1ba09ddd93b06023' into society
Merge remote-tracking branch 'origin/society' into society

Conflicts:
	app/views/events/_form.html.erb