fix mongo config
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	config/mongoid.yml
fix mongo config