Merge proposals dependent on lp://staging/~openerp-dev/openobject-doc/v7_doc_marketing_campaigns

1. v7_doc_marketing_campaigns
2. Dependent merge proposals