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

Conflicts:
	build/web/WEB-INF/classes/resouces.res
	build/web/index.xhtml
	build/web/resources/css/maincss.css
	src/java/lk/gov/health/bean/CircularController.java
	web/index.xhtml
	web/resources/css/maincss.css