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

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/societies_controller.rb
	app/views/events/_form.html.erb
	config/environments/development.rb
merge
merge again