Merge commit '8b813edc'

Conflicts:
	.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
	aliasDefinition/Data_alias/Data_alias.aod
	aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
	entity/Offer_entity/Offer_entity.aod
	entity/Offer_entity/contentDescriptionProcess.js
	entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
	entity/Offer_entity/entityfields/net/displayValueProcess.js
	entity/Offeritem_entity/afterSave.js
	entity/Order_entity/Order_entity.aod
	entity/Order_entity/entityfields/discounted_net/displayValueProcess.js
	entity/Order_entity/entityfields/net/displayValueProcess.js
	entity/Orderitem_entity/afterSave.js
	entity/Salesproject_entity/Salesproject_entity.aod
	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
	process/Offer_lib/process.js