* finish task #1897.
Merge branch 'master' of github.com:easysoft/zentaopms

Conflicts:
	module/task/view/create.html.php