add
Merge remote-tracking branch 'origin/GMY_message'

Conflicts:
	Web/Views/UserManage/Index.cshtml