Merge origin/master

Conflicts:
	src/main/java/lk/gov/sp/healthdept/entity/Item.java
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml
	src/main/webapp/WEB-INF/glassfish-web.xml
	src/main/webapp/pharmacy/pharmacy_vmp.xhtml
	src/main/webapp/pharmacy/ware_house.xhtml