* finish task #1618.
 * finish task #1617.
Merge branch 'master' of git@github.com:easysoft/zentaopms
Merge branch 'master' of git@github.com:easysoft/zentaopms
 * finish task #1623.
Merge branch 'master' of git@github.com:easysoft/zentaopms

Conflicts:

	module/productplan/control.php