adapt version number / licensing information
Merge branch 'develop' into release2.0_k2.10
Merge branch 'release2.0_k2.10' into develop