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

Conflicts:
	App/Lib/Model/Home/CouponModel.class.php