update
Merge branch 'master' of https://github.com/adqin/wecms

Conflicts:
	README.md
	application/config/config.inc.php
update