merged origin/#1058829-campaign-filter into master

entity/Campaign_entity/Campaign_entity.aod

...y/Campaign_entity/recordcontainers/db/conditionProcess.js

...rextensions/campaignstep_filter/filterConditionProcess.js

...lterextensions/campaignstep_filter/filterValuesProcess.js

...filterextensions/dateend_filter/filterConditionProcess.js

...lterextensions/datestart_filter/filterConditionProcess.js

.../filterextensions/member_filter/filterConditionProcess.js

.../db/filterextensions/member_filter/filterValuesProcess.js

...erextensions/participant_filter/filterConditionProcess.js

...ilterextensions/participant_filter/filterValuesProcess.js

.../Campaign_entity/recordcontainers/db/fromClauseProcess.js

...iners/db/recordfieldmappings/date_end.value/expression.js

...ers/db/recordfieldmappings/date_start.value/expression.js

...ldmappings/organisationconsumer/filterConditionProcess.js

...ordfieldmappings/personconsumer/filterConditionProcess.js

entity/Organisation_entity/Organisation_entity.aod

entity/Person_entity/Person_entity.aod

neonView/CampaignEdit_view/CampaignEdit_view.aod