fixes bug 111
Merge branch 'develop' into staging

Conflicts:
	Gemfile.lock
	app/models/event.rb