Few changes in Make
Few changes in Make
Merge with svr
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

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