Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' of https://github.com/nikitagorokhovtsev/canteen into dev
Server-side: bugfix
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' into dev-test
Merge remote-tracking branch 'origin/dev-test' into dev-test