Zoho and Vtiger
Merge branch 'master' of https://bitbucket.org/allyde/mautic

Conflicts:
	app/bundles/MapperBundle/Controller/MapperController.php