Merge branch 'master' into campaignmanagement

# Conflicts: # .liquibase/Data_alias/basic/2019.2/changelog.xml # aliasDefinition/Data_alias/Data_alias.aod # entity/Employee_entity/Employee_entity.aod # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod # preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

Merge branch 'master' into campaignmanagement
9ff3b4ef · David Büchler · 3b46d053 · cb641397 · 9ff3b4ef · 9ff3b4ef
Commit 9ff3b4ef authored 5 years ago by David Büchler
--- a/process/Importer_lib/Importer_lib.aod
+++ b/process/Importer_lib/Importer_lib.aod
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
--- a/process/_test_importer/_test_importer.aod
+++ b/process/_test_importer/_test_importer.aod
--- a/process/_test_importer/process.js
+++ b/process/_test_importer/process.js
--- a/process/autostartNeon/process.js
+++ b/process/autostartNeon/process.js
--- a/process/runIndexer_ws/runIndexer_ws.aod
+++ b/process/runIndexer_ws/runIndexer_ws.aod