validate test
Merge branch 'master' of https://github.com/onesup/big_coupon

Conflicts:
	app/assets/javascripts/pc.js.erb
html5