Updated gems.
Check if MX records of domains are set to managed mail server.
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	app/models/domain.rb
	config/settings.yml
	db/schema.rb