fix
Merge branch 'master' of github.com:zhusan/cms_test