Merge branch 'master' of https://github.com/thinkcmf/cmf
Merge branch 'master' of https://github.com/thinkcmf/cmf