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

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