SC#QCADOOMES-1594 QCADOOMES-1595 PKT1, PKT2
Merge branch 'dev' of github.com:qcadoo/mes