commit
Merge branch 'master' of https://github.com/susnata1981/Ziplly.git

Conflicts:
	src/META-INF/jdoconfig.xml
commit
commit
Merge branch 'master' of https://github.com/susnata1981/Ziplly