change variable names in email
Merge branch 'emailpreview' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing