SC# PKT1, PKT2 fixes
Merge branch 'master' of github.com:qcadoo/mes