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

Conflicts:
	App/Lib/Action/Home/CouponAction.class.php
	App/Runtime/Cache/Home/136059a8747562d91d7a53ac13f32224.php
	App/Tpl/Home/Coupon/detail.html
	App/Tpl/Home/Index/index.html
	Public/js/detail.js
	Public/js/index.js