merged origin/master into Receipt

...y/Activity_entity/entityfields/attributes/onValidation.js

...atusChart_entity/recordcontainers/jdito/contentProcess.js

entity/BulkMail_entity/BulkMail_entity.aod

...ulkMail_entity/entityfields/content/contentTypeProcess.js

entity/BulkMail_entity/entityfields/content/valueProcess.js

entity/BulkMail_entity/entityfields/subject/valueProcess.js

.../BulkMail_entity/entityfields/testmail/onActionProcess.js

entity/BulkMail_entity/recordcontainers/db/onDBDelete.js

entity/BulkMail_entity/recordcontainers/db/onDBInsert.js

entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js

...y/Campaign_entity/entityfields/attributes/onValidation.js

...y/Contract_entity/entityfields/attributes/onValidation.js

...ntTemplate_entity/entityfields/attributes/onValidation.js

.../Employee_entity/entityfields/contact_id/onValueChange.js

.../Employee_entity/recordcontainers/jdito/contentProcess.js

entity/Offer_entity/entityfields/attributes/onValidation.js

entity/PermissionDetail_entity/PermissionDetail_entity.aod

...ssionDetail_entity/entityfields/condition/valueProcess.js

...missionDetail_entity/entityfields/entity/onValueChange.js

...ermissionDetail_entity/recordcontainers/jdito/onInsert.js