Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
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/generated-sources/ap-source-output/lk/gov/health/entity/AdministrativeDivision_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/Category_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/CircularKeyword_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/Circular_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/Person_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/SigningAuthority_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/WebTheme_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/WebUserRole_.java
	build/generated-sources/ap-source-output/lk/gov/health/entity/WebUser_.java
	web/resources/css/default old.css
	web/resources/css/default.css
	web/resources/css/default_old.css
	web/resources/template/template_1_old.xhtml
Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Merge branch 'master' of https://github.com/buddhika75/circular.git
Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>