[Update]:fix bugs.
Merge branch 'master' of https://github.com/slamke/AutoJobServer

Conflicts:
	src/main/webapp/WEB-INF/tiles/page/taskEvaluate.jsp