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

Conflicts:
	app/views/main/index.html.slim
	app/views/orders/verbal/step_1.html.erb