Merge commit '83a6c4e3' into...

Merge commit '83a6c4e3' into 1036650_ModulisingModulesFromSalesproject

Conflicts:
	.aditoprj/project.version
	aliasDefinition/Data_alias/Data_alias.aod
	entity/360Degree_entity/360Degree_entity.aod
	entity/ActivityLink_entity/ActivityLink_entity.aod
	entity/Activity_entity/Activity_entity.aod
	entity/AddressType_entity/AddressType_entity.aod
	entity/AddressValidation_entity/AddressValidation_entity.aod
	entity/Address_entity/Address_entity.aod
	entity/Analyses_entity/Analyses_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/Attribute_entity/Attribute_entity.aod
	entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
	entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
	entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
	entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
	entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
	entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
	entity/CampaignStep_entity/CampaignStep_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/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/Employee_entity/Employee_entity.aod
	entity/Gender_keyword/Gender_keyword.aod
	entity/IndexSearchEntity/IndexSearchEntity.aod
	entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
	entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
	entity/KeywordEntry_entity/KeywordEntry_entity.aod
	entity/Language_entity/Language_entity.aod
	entity/LogHistory_entity/LogHistory_entity.aod
	entity/ModuleTree_entity/ModuleTree_entity.aod
	entity/Notification_entity/Notification_entity.aod
	entity/ObjectRelationType_entity/ObjectRelationType_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/Order_entity/Order_entity.aod
	entity/Orderitem_entity/Orderitem_entity.aod
	entity/Organisation_entity/Organisation_entity.aod
	entity/PermissionAction_entity/PermissionAction_entity.aod
	entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
	entity/PermissionOverview_entity/PermissionOverview_entity.aod
	entity/PermissionSet_entity/PermissionSet_entity.aod
	entity/Permission_entity/Permission_entity.aod
	entity/Person_entity/Person_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/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
	entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
	entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
	entity/SalesprojectMember_entity/SalesprojectMember_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/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/Classification/Classification.aod
	neonContext/ClassificationAdmin/ClassificationAdmin.aod
	neonView/ActivityFilter_view/ActivityFilter_view.aod
	neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
	neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
	neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
	neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
	neonView/ClassificationTree_view/ClassificationTree_view.aod
	neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
	neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
	neonView/SalesprojectMain_view/SalesprojectMain_view.aod
	neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod