DF#QCADOOMES-1529 - additional fixes for NPEs
Merge branch 'master' of github.com:/qcadoo/mes
SC#QCADOOMES-1561 (PARTIAL) refactor reason types for effective dates deviation
CM manually resolve git merge conflicts
Merge branch 'master' of github.com:/qcadoo/mes