bug fix
Merge branch 'dev' of https://github.com/nikitagorokhovtsev/canteen into dev
Merge branch 'dev' into dev-test