added updates to emails module
Merge branch '1301_tendenci_admin_mega_menu' into bixly-testing