Added some new Pages
Merge https://github.com/rathordeepak1985/jewellery

Conflicts:
	src/main/java/com/defysope/model/Discount.java
	src/main/webapp/WEB-INF/ftl/addDiscount.ftl