Merge branch 'eventsBerkeley-withoutDays' into merge-eventsBerkeley-polished
Merge branch 'merge-eventsBerkeley-polished'

Conflicts:
	app/models/event.rb
	features/step_definitions/getFbEventAndSave.rb