Signed-off-by: mylifeofjava@gmail.com <mylifeofjava@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/conf/persistence.xml
Signed-off-by: HNDITRilwan <rilwan0123@gmail.com>
Signed-off-by: HNDITRilwan <rilwan0123@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

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