CM merged samples
Merge branch 'dev' of github.com:qcadoo/mes into dev