fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/admin/users/_form.html.erb

	modified:   app/models/user.rb
	modified:   app/views/admin/contacts/_form.html.erb
	modified:   app/views/admin/users/_form.html.erb