summery
Merge remote-tracking branch 'origin/master'

Conflicts:
	Manali/Controllers/UserController.cs
	Manali/bin/Manali.dll
	Manali/bin/Manali.pdb
	Manali/obj/Debug/Manali.dll
	Manali/obj/Debug/Manali.pdb