local changes
Merge branch 'BeforeRemovingItemUnitFromBillItem'

Conflicts:
	setup/glassfish-resources.xml
	src/conf/persistence.xml
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
	setup/glassfish-resources.xml
	src/conf/persistence.xml
Acrticle intial stage
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
	setup/glassfish-resources.xml
	src/conf/persistence.xml