BAP-2367: Doesn't throw 404 error in contacts and accounts edit page if was given wrong id.
BAP-2561: Relocate Email Proxy to cache folder
Merge pull request #306 from laboro/ticket/BAP-2561

BAP-2561: Relocate Email Proxy to cache folder
CRM-732: Funnel chart
Merge remote-tracking branch 'remotes/public/master'
CRM-728: funnel chart refactor
CRM-735: Add placeholder for primary workflow, add template for it and add widgets to this template, ensure that it works, CRM-737: Use primary config field in template
fix magento import
CRM-732: Funnel chart
Merge branch 'task/CRM-728' of github.com:laboro/crm into task/CRM-728
CRM-732: Funnel chart
CRM-732: Funnel chart
Fix order import
CRM-678: Magento integration, fix complex filter issue
   - bug fixes
CRM-678: Magento integration, fix complex filter issue
   - bug fixes
CRM-678: Magento integration, fix complex filter issue
   - bug fixes
CRM-678: Magento integration, fix complex filter issue
- fix code style
CRM-678: Magento integration, fix complex filter issue
- remove not used
Merge pull request #307 from laboro/fix/mage-import

fix magento import
Merge branch 'master' into ticket/CRM-729_workflow_improvements