Merge origin/master into object-relation

...rice_entity/entityfields/currency/possibleItemsProcess.js

...ds/keywordcurrencies/children/containername_param/code.js

...b/recordfieldmappings/currency.displayvalue/expression.js

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

...b_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml

...ta/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml

...data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml

.../data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml

...as/data/AditoBasic/ab_keyword_entry/init_ContractType.xml

..._alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml

...ias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml

...a/AditoBasic/ab_keyword_entry/init_OfferitemGroupcode.xml

...ata/AditoBasic/ab_keyword_entry/init_OrganisationType.xml

...as/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml

...ata/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml

...as/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml

.../data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml

...itoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml