fix contact creation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/user.rb

	modified:   app/models/user.rb