Merge branch 'master' of https://github.com/chenmingde/mobile-cms
Merge remote-tracking branch 'origin/master'