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

Conflicts:
	build/web/WEB-INF/classes/META-INF/persistence.xml
	nbproject/genfiles.properties
	nbproject/private/private.xml
	setup/glassfish-resources.xml
	src/conf/persistence.xml