Merge origin/master into object-relation

...ta/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml

...Basic/ab_keyword_entry/init_SalesprojectPricePolitics.xml

...ata/AditoBasic/ab_keyword_entry/init_SalesprojectRole.xml

...a/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml

...ta/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml

...AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml

...AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml

.../AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml

.../data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml

...lias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml

..._alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml

...es/data_alias/data/example_contract/CONTRACT_42154311.xml

...es/data_alias/data/example_contract/CONTRACT_42154312.xml

...es/data_alias/data/example_contract/CONTRACT_42154313.xml

...es/data_alias/data/example_contract/CONTRACT_42154314.xml

...es/data_alias/data/example_contract/CONTRACT_42154315.xml

...s/db_changes/data_alias/data/example_offer/OFFER_1000.xml

...s/db_changes/data_alias/data/example_offer/OFFER_1001.xml

...s/db_changes/data_alias/data/example_offer/OFFER_1002.xml

...s/db_changes/data_alias/data/example_offer/OFFER_1003.xml