1
Merge branch 'master' of https://github.com/erickung/yunying

Conflicts:
	component/base/RootActiveRecord.php
upload