merge again
Merge remote-tracking branch 'origin/society' into society

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