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

Conflicts:
	src/main/webapp/WEB-INF/view/mypage/mypage.ftl