Bug fix and added test cases
Merge remote-tracking branch 'origin/master'

Conflicts:
	zorba-persistence-mongo/pom.xml