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
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
Merge origin/master

Conflicts:
	README.md
Merge origin/master

Conflicts:
	build/generated-sources/ap-source-output/entity/Person_.java
	build/generated-sources/ap-source-output/entity/Questioner_.java
	build/generated-sources/ap-source-output/entity/Response_.java
	build/web/WEB-INF/classes/bean/AnalysisController.class
	build/web/WEB-INF/classes/entity/Person_.class
	build/web/WEB-INF/classes/entity/Questioner_.class
	build/web/WEB-INF/classes/entity/Response_.class
	dist/servey.war
	nbproject/private/private.properties
	src/java/bean/AnalysisController.java