#y-46 work 1h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/order/verbal.rb
	coverage/.last_run.json
	coverage/.resultset.json