Merge remote-tracking branch 'origin/master' into campaignmanagement

# Conflicts:
#	.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml
#	entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js
#	entity/CampaignStep_entity/entityfields/date_end/onValidation.js
#	entity/CampaignStep_entity/entityfields/date_start/onValidation.js
#	entity/CampaignStep_entity/entityfields/date_start/onValueChange.js
#	entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
#	entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
#	entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	neonContext/Campaign/Campaign.aod
#	neonContext/CampaignAnalysis/CampaignAnalysis.aod
#	neonContext/CampaignCost/CampaignCost.aod
#	neonContext/CampaignStep/CampaignStep.aod
#	neonView/CampaignCharts_view/CampaignCharts_view.aod
#	neonView/CampaignCostFix_view/CampaignCostFix_view.aod
#	neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
#	neonView/CampaignCost_view/CampaignCost_view.aod
#	neonView/CampaignMain_view/CampaignMain_view.aod
#	neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
#	neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
#	neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
#	neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod