Merge branch 'master' of https://github.com/hackingwu/EasyCMS

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'