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

# By lahirumadushanka
# Via lahirumadushanka
* 'master' of https://github.com/buddhika75/circular.git:
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
  Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>

Conflicts:
	build/web/WEB-INF/classes/META-INF/persistence.xml
	build/web/edit_circular.xhtml
	nbproject/project.properties
	setup/glassfish-resources.xml
	src/conf/persistence.xml
	web/edit_circular.xhtml
	web/resources/template/template_1.xhtml