Merged SmartEmail template into base repo