Server changes

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

Conflicts:
	src/java/Labels.properties
svr changes