from git_push.sh
Merge branch 'master' of https://github.com/cjinle/cms1