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

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
	src/conf/persistence.xml
Local changes
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/conf/persistence.xml
Working on article editing
Working on article editing