超絶開発中
Merge branch 'master' of github.com:hafuka/coupon

Conflicts:
	src/main/webapp/WEB-INF/classes/coupon/action/RegisterAction.class
	src/main/webapp/WEB-INF/classes/coupon/service/impl/UserServiceImpl.class