bottle type check ins
Merge branch 'master' of https://github.com/vharnath/Pristine

Conflicts:
	src/main/java/com/pristine/controller/WineController.java
	src/main/webapp/jsp/add-new-wine-product.jsp
Pagination fixes
pagination fix
Merge branch 'master' of https://github.com/vharnath/Pristine

Conflicts:
	src/main/java/com/pristine/controller/WineController.java
	src/main/java/com/pristine/model/WineDetail.java
	src/main/webapp/jsp/add-new-wine-product.jsp