* fix bug#489.
 * fix bug#488.
Merge branch 'master' of git@github.com:easysoft/zentaopms