EditDish input fixes
Merge branch 'master' of https://github.com/pashkov/Spontaneous