SC#QCADOOMES-1817, QCADOOMES-1819 nbl - workstation
Merge branch 'dev' of https://github.com/qcadoo/mes into dev