provided content on file for mailjet
Merge branch 'dev' into prod