for partner
Merge branch 'master' of https://github.com/huiguilin/trunk

Conflicts:
	App/Conf/config.php