SC#QCADOOMES-1831 Some fixes after demo.
Merge branch 'dev' of github.com:qcadoo/mes into dev