buddy pc local changes
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/private/private.xml
Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Merge branch 'master' of https://buddhika75@github.com/pdhssp/HealthOffice.git

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	web/WEB-INF/web.xml
	web/resources/template/pdhs_template_1.xhtml
Major Changes in Class Strucuture
Signed-off-by: buddhika75 <buddhika.ari@gmail.com>