Signed-off-by: wangjingye <4893278@qq.com>
Merge branch 'master' of https://github.com/WangJingye/TaskManage

Conflicts:
	TaskManage/App_Start/BackloadConfig.cs
	TaskManage/Content/css/common.css
	TaskManage/Views/Admin/AdminUser.cshtml
	TaskManage/Views/Shared/_Layout.cshtml
	TaskManage/Views/User/Login.cshtml

Signed-off-by: wangjingye <4893278@qq.com>