Merge branch 'master' into campaignmanagement

# Conflicts:
#	.aditoprj/project.version
#	aliasDefinition/Data_alias/Data_alias.aod
#	entity/Appointment_entity/Appointment_entity.aod
#	entity/Attribute_entity/Attribute_entity.aod
#	entity/EmployeeRole_entity/EmployeeRole_entity.aod
#	entity/Employee_entity/Employee_entity.aod
#	entity/Person_entity/Person_entity.aod
#	entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod