Merge branch 'master' of gitlab.adito.de:xrm/basic into Fix_1035784

# Conflicts:
#	entity/Document_entity/Document_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod