Merge branch 'master' into develop
Removing images from email
Merge branch 'develop'