convert from UserProfileData to UserProfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/UserProfileController.scala
convert from UserProfileData to UserProfile
convert from UserProfileData to UserProfile