Fix error in events#new?
More fixes [WARNING: untested]
Merge branch 'fixes'

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