Merge origin/master

entity/Stock_entity/entityfields/stockid/valueProcess.js

entity/Stock_entity/entityfields/user_edit/valueProcess.js

entity/Stock_entity/entityfields/user_new/valueProcess.js

...ock_entity/entityfields/warehouse/possibleItemsProcess.js

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

neonContext/Product_context/Product_context.aod

neonContext/Productprice_context/Productprice_context.aod

neonContext/Stock_context/Stock_context.aod

neonView/OrgMain_view/OrgMain_view.aod

neonView/PersMain_view/PersMain_view.aod

neonView/ProductMain_view/ProductMain_view.aod

neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod

neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod

...w/ProductpriceRelation_view/ProductpriceRelation_view.aod

neonView/StockEdit_view/StockEdit_view.aod

neonView/StockFilter_view/StockFilter_view.aod

others/db_changes/masterChangelog.xml

others/db_changes/struct/contractChanges.xml