#y-13 work 8h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/order/verbal.rb