Signed-off-by: unknown <jingye.Wang@SVR40.jago-cn.de>
Merge branch 'master' of https://github.com/WangJingye/TaskManage

Conflicts:
	TaskManage/Content/css/common.css
	TaskManage/Views/Document/documentList.cshtml
	TaskManage/Views/Task/Index.cshtml
	TaskManage/Views/Task/SubTaskDetail.cshtml
Signed-off-by: unknown <jingye.Wang@SVR40.jago-cn.de>