Merge remote-tracking branch 'origin/dev'

Hey,

I want to add local takeaway service just eat to this and volume control.