Merge origin/master

Conflicts:
	README.md
Merge branch 'master' of https://github.com/buddhika75/nbds.git

Conflicts:
	setup/glassfish-resources.xml
	src/conf/persistence.xml
	web/add_hospital_notification_form.xhtml
	web/birth_diffect_abstraction_form.xhtml

Signed-off-by: PDHS-SP <pdhs@pdhssp-ML350p.(none)>