Merge remote-tracking branch 'origin/GMY_TS'

Conflicts:
	Web/Views/Login/UserLogin.cshtml
Merge remote-tracking branch 'origin/GMY_TS'

Conflicts:
	Web/App_Start/RouteConfig.cs
	Web/Views/SingleChat/ChatPartialView.cshtml
add