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

# Conflicts:
#	entity/ActivityLink_entity/ActivityLink_entity.aod
#	entity/AddressType_entity/AddressType_entity.aod
#	entity/AddressValidation_entity/AddressValidation_entity.aod
#	entity/Address_entity/Address_entity.aod
#	entity/AnyContact_entity/AnyContact_entity.aod
#	entity/AppointmentLink_entity/AppointmentLink_entity.aod
#	entity/Appointment_entity/Appointment_entity.aod
#	entity/AttributeRelation_entity/AttributeRelation_entity.aod
#	entity/AttributeUsage_entity/AttributeUsage_entity.aod
#	entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
#	entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
#	entity/Campaign_entity/Campaign_entity.aod
#	entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
#	entity/ClassificationScore_entity/ClassificationScore_entity.aod
#	entity/ClassificationType_entity/ClassificationType_entity.aod
#	entity/Classification_entity/Classification_entity.aod
#	entity/Communication_entity/Communication_entity.aod
#	entity/Competition_entity/Competition_entity.aod
#	entity/Contact_entity/Contact_entity.aod
#	entity/Context_entity/Context_entity.aod
#	entity/Contract_entity/Contract_entity.aod
#	entity/Countries_Entity/Countries_Entity.aod
#	entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
#	entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
#	entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
#	entity/Document_entity/Document_entity.aod
#	entity/Email_entity/Email_entity.aod
#	entity/EmployeeRole_entity/EmployeeRole_entity.aod
#	entity/Forecast_entity/Forecast_entity.aod
#	entity/Gender_keyword/Gender_keyword.aod
#	entity/IndexSearchEntity/IndexSearchEntity.aod
#	entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
#	entity/KeywordEntry_entity/KeywordEntry_entity.aod
#	entity/Language_entity/Language_entity.aod
#	entity/Letter_entity/Letter_entity.aod
#	entity/LogHistory_entity/LogHistory_entity.aod
#	entity/Member_entity/Member_entity.aod
#	entity/ModuleTree_entity/ModuleTree_entity.aod
#	entity/Notification_entity/Notification_entity.aod
#	entity/ObjectTree_entity/ObjectTree_entity.aod
#	entity/Object_entity/Object_entity.aod
#	entity/Offer_entity/Offer_entity.aod
#	entity/Offeritem_entity/Offeritem_entity.aod
#	entity/Options_Entity/Options_Entity.aod
#	entity/Orderitem_entity/Orderitem_entity.aod
#	entity/PermissionDetail_entity/PermissionDetail_entity.aod
#	entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
#	entity/PermissionOverview_entity/PermissionOverview_entity.aod
#	entity/Prod2prod_entity/Prod2prod_entity.aod
#	entity/Product_entity/Product_entity.aod
#	entity/Productprice_entity/Productprice_entity.aod
#	entity/Role_entity/Role_entity.aod
#	entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
#	entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
#	entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
#	entity/Salesproject_entity/Salesproject_entity.aod
#	entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
#	entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
#	entity/Salutation_entity/Salutation_entity.aod
#	entity/Social_entity/Social_entity.aod
#	entity/Stock_entity/Stock_entity.aod
#	entity/TaskLink_entity/TaskLink_entity.aod
#	entity/Task_entity/Task_entity.aod
#	entity/Timetracking_entity/Timetracking_entity.aod
#	entity/TurnoverTree_entity/TurnoverTree_entity.aod
#	entity/Turnover_entity/Turnover_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	neonContext/Campaign/Campaign.aod
#	neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
#	neonView/AppointmentPreview_view/AppointmentPreview_view.aod
#	neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
#	neonView/NotificationFilter_view/NotificationFilter_view.aod
#	neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
#	neonView/SalesprojectMain_view/SalesprojectMain_view.aod
#	neonView/TaskEdit_view/TaskEdit_view.aod
#	neonView/TaskFilter_view/TaskFilter_view.aod
#	neonView/TaskMainPreview_view/TaskMainPreview_view.aod
#	neonView/TaskMain_view/TaskMain_view.aod
#	neonView/TaskPreview_view/TaskPreview_view.aod