Merge remote-tracking branch 'origin/hangouts-from-events' into hangouts-from-events

Conflicts:
	app/controllers/hangouts_controller.rb
	app/helpers/hangouts_helper.rb
	app/models/event.rb
	app/models/hangout.rb
	app/presenters/hangout_presenter.rb
	app/views/hangouts/_form.html.erb
	app/views/hangouts/_hangouts.html.erb
	app/views/hangouts/_hangouts_management.html.erb
	app/views/hangouts/_index_basic_info_started.html.erb
	app/views/hangouts/_index_basic_info_upcoming.html.erb
	app/views/hangouts/_index_extra_info.html.erb
	app/views/hangouts/_index_extra_info_started.html.erb
	app/views/hangouts/_index_extra_info_upcoming.html.erb
	app/views/hangouts/manage.html.erb
	config/routes.rb
	db/migrate/20140910225619_add_exclusions_to_events.rb
	features/events.feature
	spec/controllers/hangouts_controller_spec.rb
	spec/models/event_spec.rb