hello
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop-api/src/main/java/com/droidshop/api/Application.java
	DroidShop-api/src/main/java/com/droidshop/api/manager/ProductManager.java
	DroidShop-api/src/main/java/com/droidshop/api/manager/PurchaseManager.java
	DroidShop-api/src/main/java/com/droidshop/api/model/product/Product.java
	DroidShop-api/src/main/resources/database/localhost.properties
	DroidShop-api/src/main/resources/hibernate.cfg.xml
	DroidShop-api/src/main/webapp/WEB-INF/droidshop-servlet.xml
	DroidShop-api/src/main/webapp/WEB-INF/web.xml