Mongo
Merge branch 'master' of https://github.com/lbeuster/sandbox.git

Conflicts:
	sandbox-mongodb/src/main/java/de/lbe/sandbox/mongodb/morphia/MorphiaMain.java