* fix a bug for merge personal config.
Merge branch 'master' of github.com:easysoft/zentaopms