bug fix
Merge branch 'master' of https://github.com/huiguilin/trunk

Conflicts:
	App/Lib/Action/Home/PartnerAction.class.php
	App/Runtime/Cache/Home/136059a8747562d91d7a53ac13f32224.php
	App/Runtime/Cache/Home/24cd4a6b1a017e55e5e3587bddf7567d.php
	App/Runtime/Cache/Home/5af3b772512f93bbed89b40e875139eb.php