Update style reset and action email screen
Merge branch 'develop' into feature/tinyMCE.v4