updated readme
Merge branch 'master' of https://github.com/shuge/mcms

Conflicts:
	README.md
Copy features macro tex and graphviz from zbox_wiki 201212