color changing [MJ-580]
btn text shadow fix [MJ-580]
more color changing, new buttons [MJ-580]
email template button [MJ-580]
Fix merge conflicts
Add back style change lost in mergetool. MJ-580
Merge branch 'FEATURE-rebrand' into update-logos
topbar color changes [MJ-580]
Merge branch 'colors' into FEATURE-rebrand
Merge branch 'FEATURE-rebrand' into update-logos