Update Zurich email templates
Merge remote-tracking branch 'upstream/master'
Simple error fix on our cobrand controller