DF#QCADOOMES-1537, QCADOOMES-1541, QCADOOMES-1542, QCADOOMES-1540 fixed
Merge branch 'master' of github.com:qcadoo/mes