tree ec0acae3c064a0a6d66916990aabdcc55cf00123
parent 0e8efe639b6e92c9826b25e80627bc704d164739
parent cc2da83ee9f3e4748bf8926d4c3c7a2d50be8da8
author Matthias Koller <m.koller@peak-solution.de> 1573214180 +0100
committer Matthias Koller <m.koller@peak-solution.de> 1573214180 +0100

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle
	org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityService.java
	org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ReflectUtil.java

Signed-off-by: Matthias Koller <m.koller@peak-solution.de>