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

# By lahirumadushanka (1) and others
# Via lahirumadushanka (1) and others
* 'master' of https://github.com/pdhssp/HealthOffice.git:
  Signed-off-by: mylifeofjava@gmail.com <mylifeofjava@gmail.com> Signed-off-by: unknown <theja@User-PC.singworld.com>
  Signed-off-by: mylifeofjava@gmail.com <mylifeofjava@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>

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

Signed-off-by: buddhika75 <buddhika.ari@gmail.com>