commit
Merge branch 'master' of https://github.com/Hajimex/zen_plugin

Conflicts:
	coupon_iphone/_coupon_iphone.js.erb
	coupon_iphone/javascripts/_zc-box.js.erb