Merge branch 'master' into campaignmanagement

# Conflicts:
#	entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js
#	entity/CampaignStep_entity/CampaignStep_entity.aod
#	entity/Campaign_entity/Campaign_entity.aod
#	entity/Campaign_entity/recordcontainers/db/onDBDelete.js
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	neonView/CampaignMain_view/CampaignMain_view.aod
#	neonView/CampaignStepMain_view/CampaignStepMain_view.aod
#	process/Campaign_lib/process.js