merged origin/master into CalBranchLocal

entity/360Degree_entity/360Degree_entity.aod

...360Degree_entity/recordcontainers/jdito/contentProcess.js

...nyContact_entity/entityfields/contacttype/valueProcess.js

...nyContact_entity/recordcontainers/db/fromClauseProcess.js

entity/Contact_entity/Contact_entity.aod

...ntact_entity/entityfields/organisation_id/onValidation.js

...s/children/excludeorganisationsbypersonid/valueProcess.js

...ct_entity/entityfields/contact_id/linkedContextProcess.js

entity/KeywordEntry_entity/KeywordEntry_entity.aod

...ty/Object_entity/recordcontainers/jdito/contentProcess.js

entity/Offer_entity/Offer_entity.aod

...lds/activities/children/presetlinks_param/valueProcess.js

...er_entity/entityfields/contact_id/linkedContextProcess.js

.../Offer_entity/entityfields/newactivity/onActionProcess.js

entity/Offer_entity/entityfields/newtask/onActionProcess.js

...r_entity/entityfields/salesproject_id/mandatoryProcess.js

entity/Offer_entity/entityfields/status/valueProcess.js

...tyfields/tasks/children/presetlinks_param/valueProcess.js

...lds/activities/children/presetlinks_param/valueProcess.js

...er_entity/entityfields/contact_id/linkedContextProcess.js