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

# Conflicts:
#	entity/Person_entity/Person_entity.aod
#	neonView/ActivityPreview_view/ActivityPreview_view.aod
#	neonView/CampaignPreview_view/CampaignPreview_view.aod
#	neonView/EmployeePreview_view/EmployeePreview_view.aod
#	neonView/OfferPreview_view/OfferPreview_view.aod
#	neonView/OrderPreview_view/OrderPreview_view.aod
#	neonView/RolePreview_view/RolePreview_view.aod