xxxxxxxx
Merge remote-tracking branch 'origin/master'

Conflicts:
	Manali/Controllers/UserController.cs
	Manali/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache