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

Conflicts:
	setup/glassfish-resources.xml
	src/conf/persistence.xml
Merge branch 'master' of https://github.com/buddhika75/nbds.git

Conflicts:
	setup/glassfish-resources.xml
	src/conf/persistence.xml