CRM-2039: Improve marketing lists with Manual type
Merge remote-tracking branch 'origin/master' into feature/CRM-1182_mailchimp
Merge branch 'master' into feature/CRM-1182_mailchimp
Merge branch 'master' into feature/CRM-1182_mailchimp
CRM-2121: Create Workflow for Marketing List to connect it with MailChimp
CRM-1965: Add ability to restrict email campaign transport selection
Merge remote-tracking branch 'origin/ticket/CRM-2121_mailchimp_workflow' into feature/CRM-1182_mailchimp
Merge remote-tracking branch 'origin/feature/CRM-2113_email_campaign_recipients' into feature/CRM-1182_mailchimp
CRM-1965: Added possibility see current transport in the edit form of email campaign
CRM-1965: Added possibility see current transport in the edit form of email campaign
Merge remote-tracking branch 'origin/ticket/CRM-2121_mailchimp_workflow_FIX' into feature/CRM-1182_mailchimp

Conflicts:
	src/OroCRM/Bundle/MarketingListBundle/Model/Condition/HasContactInformation.php
Merge remote-tracking branch 'origin/feature/CRM-2113_email_campaign_recipients' into feature/CRM-1182_mailchimp
Merge branch 'feature/CRM-1182_mailchimp' into feature/CRM-1965
Merge branch 'fix/CRM-2047' into feature/CRM-1182_mailchimp
Merge branch 'master' into feature/CRM-1182_mailchimp
Merge branch 'feature/CRM-1182_mailchimp' of github.com:laboro/crm into feature/CRM-1182_mailchimp
CRM-1965: Refactoring form builder of the EmailCampaign to add transport field with visibility property
Merge branch 'feature/CRM-1965' of github.com:laboro/crm into feature/CRM-1965
CRM-1965: Code format fix
CRM-2130: Job for synchronization of Segments and Marketing Lists (list adds and removals)
- fix sync