Merge branch 'master' of github.com:cargomedia/CM into MongoDb-adjustments

Conflicts:
	library/CM/Service/MongoDb.php
	tests/library/CM/Service/MongoDbTest.php