Bug 841521 - The Trusted UI never opens on first launch (purchase button does nothing). r=alive, albertopq
Bug 829078 - [email] adjust and remove some styles in *.css of email

Conflicts:
	apps/email/style/compose-cards.css
	apps/email/style/custom_dialog.css
Bug 844995 - Setting up new email account screen updates
Bug 844973 - New Account Screen - Layout and Type updates
Bug 845048 - Email screen type and layout updates

Conflicts:
	apps/email/style/message-cards.css
Bug 845042 - Load more messages layout and type update
Bug 844978 - Email Manual Setup Layout and Type updates
Merge pull request #8601 from ferjm/bug841521

Bug 841521 - The Trusted UI never opens on first launch (purchase button...
Bug 830644 - Support WVGA and other non-HiDPI screen dimensions and resolutions
                 * system [all components but the ones already landed]:
                   px to rem, added background size definitions.
                 * added @2x assests for system
Merge pull request #8710 from rexboy7/responsive-ui

Bug 830644 - Support WVGA and other non-HiDPI screen dimensions and reso...
Bug 852550 - [email] naive drawer tray transition from bug 846901 with stationary folder list impacts fps; remove. r=asuth
Merge pull request #8713 from asutherland/email-remove-tray-transition-fps-hit

Bug 852550 - [email] naive drawer tray transition from bug 846901 with stationary folder list impacts fps; remove. r=asuth
Merge pull request #8703 from samjoch/email-app

Ux email app bugs left
Bug 852516 - Fix timing issues in contacts app (initial load)
Merge error