pom
Merge branch 'master' of
https://github.com/projectdanube/xdi2-mongodb.git

Conflicts:
	pom.xml