Merge branch 'develop' into feature/choices-implementation

# Conflicts:
#	cda-model/pom.xml
#	cdaepsos-model/pom.xml
#	common-models/pom.xml
#	datatypes-model/pom.xml
#	infr-model/pom.xml
#	model-resources/pom.xml
#	nblock-model/pom.xml
#	pom.xml
#	voc-model/pom.xml