* fix a bug #646.
 * fix bug #645.
Merge branch 'master' of github.com:easysoft/zentaopms