# Conflicts:
#	application/modules/Marketing/controllers/Marketing.php
#	application/services/marketing/MarketingService.php