Merge branch 'master' into userConfiguration

...t_entity/entityfields/advertisingban_icon/colorProcess.js

...t_entity/entityfields/advertisingban_icon/valueProcess.js

entity/LetterRecipient_entity/LetterRecipient_entity.aod

...rRecipient_entity/entityfields/contact_id/onValidation.js

entity/Offer_entity/Offer_entity.aod

entity/Offer_entity/entityfields/contact_id/onValueChange.js

...ty/Offer_entity/entityfields/object_rowid/stateProcess.js

...ty/Offer_entity/entityfields/object_rowid/valueProcess.js

...y/Offeritem_entity/entityfields/quantity/onValueChange.js

.../Offeritem_entity/entityfields/totalprice/valueProcess.js

entity/Offeritem_entity/grantDeleteProcess.js

entity/Person_entity/Person_entity.aod

...actiongroup/children/addtoserialletter/onActionProcess.js

...ty/Prod2prod_entity/entityfields/optional/valueProcess.js

...y/Prod2prod_entity/entityfields/takeprice/valueProcess.js

entity/Productprice_entity/Productprice_entity.aod

...sprojectMilestone_entity/SalesprojectMilestone_entity.aod

...lestone_entity/entityfields/valuelongname/valueProcess.js

...AddRecipients_entity/SerialLetterAddRecipients_entity.aod

...s_entity/entityfields/recipientcontactids/valueProcess.js