Merge remote-tracking branch 'origin/master' into yuguiqi

Conflicts:
	README.md
	WebRoot/WEB-INF/fornt/addTask.jsp
	WebRoot/WEB-INF/fornt/header.html
	WebRoot/WEB-INF/fornt/index.jsp
	WebRoot/WEB-INF/fornt/taskInfo/show.jsp
	src/com/guotingchao/controlle/front/TaskAddController.java