DF#QCADOOMES-1529 changed validation, fixed NPE
Merge branch 'master' of http://github.com/qcadoo/mes