SalesforceBundle and MapperChanges
Merge branch 'master' of https://bitbucket.org/allyde/mautic

Conflicts:
	app/bundles/MapperBundle/Entity/ApplicationObjectMapper.php
Salesforce Mapper