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

Conflicts:
	build/web/about_us.xhtml
	build/web/edit_circular.xhtml
	web/about_us.xhtml
	web/edit_circular.xhtml

Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>