l
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
Improvement of Purchase