123
Merge remote-tracking branch 'hermes/master'

Conflicts:
	hermes/hermes-api/src/main/resources/mongo.properties