Merge origin/master into #1035025_SALUTATION

Conflicts: entity/Person_entity/Person_entity.aod entity/Person_entity/entityfields/salutation/possibleItemsProcess.js others/db_changes/masterChangelog.xml

Merge origin/master into #1035025_SALUTATION
2cf3de73 · Johannes Hörmann · 1569043f · e5f863eb · 2cf3de73 · 2cf3de73
Commit 2cf3de73 authored 6 years ago by Johannes Hörmann
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_1002.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_1002.xml
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_1003.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_1003.xml
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_1004.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_1004.xml
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml
--- a/others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
--- a/others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
--- a/others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
--- a/others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
--- a/others/db_changes/data_alias/data/example_person/PERSON_muller.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_muller.xml
--- a/others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml