cccc
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/event.rb
	app/views/societies/show.html.erb