update
fix some problems
Merge commit '2e5b11f0317e03ed1950f491052fd11f831deabd'

Conflicts:
	confs/mongo/mongodb.conf