branch contact
Merge branch 'contact'

Conflicts:
	config/initializers/rails_admin.rb