Merge origin/master

entity/ActivityLink_entity/ActivityLink_entity.aod

...ivityLink_entity/entityfields/activity_id/valueProcess.js

...tyLink_entity/entityfields/activitylinkid/valueProcess.js

...k_entity/entityfields/object_rowid/displayValueProcess.js

...tivityLink_entity/recordcontainers/db/conditionProcess.js

entity/Activity_entity/Activity_entity.aod

...tity/entityfields/links/children/activityid_param/code.js

...ivity_entity/entityfields/subject_details/valueProcess.js

...y/Activity_entity/recordcontainers/db/conditionProcess.js

entity/Contract_entity/Contract_entity.aod

...y/entityfields/activities/children/objectid_param/code.js

...ntract_entity/entityfields/newactivity/onActionProcess.js

entity/Offer_entity/Offer_entity.aod

...y/entityfields/activities/children/objectid_param/code.js

...tity/entityfields/activities/children/rowid_param/code.js

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

entity/Order_entity/Order_entity.aod

...y/entityfields/activities/children/objectid_param/code.js

...tity/entityfields/activities/children/rowid_param/code.js

.../Order_entity/entityfields/newactivity/onActionProcess.js