cookie問題
Merge branch 'master' of github.com:Hajimex/zen_plugin

Conflicts:
	coupon_iphone/_coupon_iphone.js.erb