Web:
Emails
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/static_pages_controller.rb
	app/views/organizations/_fields.html.erb
	app/views/service_calls/show.html.erb
	app/views/static_pages/welcome.html.erb
	config/locales/events/en.yml
	config/locales/mailers/notification_mailer/en.yml
	config/locales/models/notification/en.yml
	config/locales/models/service_call/en.yml
	config/locales/view/service_call/en.yml
Web:
Emails
Web:
Emails - Received
Web:
Emails - Received
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb