#mg-88 fixed work 1h
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	config/mongoid.yml