Merge remote-tracking branch 'origin/GMY_TS'
Merge remote-tracking branch 'origin/GMY_TS'

Conflicts:
	Web/Views/Login/SystemLogin.cshtml
	Web/Views/Login/UserLogin.cshtml
add