Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Merge branch 'master' of https://github.com/buddhika75/circular.git

Conflicts:
	build/web/Replace_Circular.xhtml
	build/web/WEB-INF/classes/resouces.res
	build/web/division_circulars.xhtml
	build/web/resources/css/maincss.css
	src/java/lk/gov/health/data/Labels.properties
	src/java/lk/gov/health/data/Labels_si.properties
	src/java/lk/gov/health/data/Labels_ta.properties
	web/Replace_Circular.xhtml
	web/division_circulars.xhtml
	web/index.xhtml
	web/replace_circular.xhtml
	web/resources/css/maincss.css
	web/resources/template/template_1.xhtml
	web/resources/template/template_1old.xhtml
	web/resources/template/template_1test.xhtml
	web/staff_login.xhtml