RF attempt to fix problem with bytecode error during tests run on CI
fixed problem with bytecode verification error @ tests in mes-plugins-samples
Merge branch 'update/aclAndJava8' into dev
CM fixed unit tests
Merge branch 'update/aclAndJava8' into dev
CM upgrade script for ACL
Merge branch 'update/aclAndJava8' into dev
DF# QCADOOCLS-2746 added update scripts for work plans columns
DF# QCADOOMES-2366
SC# QCADOOCLS-2469
RF# QCADOOCLS-2469 fixed additional rows height
Merge branch 'dev' of https://github.com/qcadoo/mes into feature/dynamicAttributesMFR

Conflicts:
	mes-application/sql/1.4/upgrade_mes-dev.sql