iPhone check
conflict fix

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