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

Conflicts:
	App/Lib/Action/Home/CouponAction.class.php