BuddyLaptop Local Changes
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git
Before removing BillUnit from BillItem
Local Changes
admin-pc changes
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git
Buddhika-LBuddhika Laptop Inventry changes

Signed-off-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git into BeforeRemovingItemUnitFromBillItem

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
	src/conf/persistence.xml
	src/java/gov/sp/health/bean/PurchaseBillController.java
	web/inventory_purchase.xhtml
admin-lap
Merge branch 'BeforeRemovingItemUnitFromBillItem' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/private/private.properties
	src/conf/persistence.xml