#309 fixed malformed email template
Merge pull request #310 from pencilblue/PB309

#309 fixed malformed email template
#309 fixed malformed email template
fixes admin sub_memu marin-bottom
Merge pull request #311 from JahlomP/admin-sub_nav-margin

Admin sub nav margin
Merge branch 'master' into angular-admin
edit article finished