DF#QCADOOMES-2314, QCADOOMES-2307 pkt fixes
Merge branch 'dev' of https://github.com/qcadoo/mes into dev