merge
Merge

Conflicts:
	app/models/user_profile.rb
	db/schema.rb