.
Merge branch 'master' of https://github.com/inamvar/ducoupon

Conflicts:
	src/main/webapp/WEB-INF/views/deals/create.jspx
.