merge
Merge branch 'master' of https://github.com/010227leo/HT
Merge branch 'master' of https://github.com/010227leo/HT
merge
Merge branch 'master' of https://github.com/010227leo/HT

Conflicts:
	HT.Web/Controllers/UserController.cs