commit merge
Merge branch 'feature_profiles' of https://github.com/aspNetIng3/Youp into feature_profiles
UserController
Merge branch 'feature_profiles' of https://github.com/aspNetIng3/Youp into feature_profiles

Conflicts:
	YoupFO/Models/User.cs