lap changes
Before removing BillUnit from BillItem
Invenroty Items Finished
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git into BeforeRemovingItemUnitFromBillItem

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