Bug 850170 - [Dialer] Unknown (hidden) calls are not grouped.
Merge pull request #8616 from gtorodelvalle/dialer-bug-850170-grouping-unknown-calls

Bug 850170 - [Dialer] Unknown (hidden) calls are not grouped (r=jmcanterafonseca)
Bug 849751 - Add cck/spck support to FTU and the system app.
[Settings] Support high resolution devices (2)
Merge pull request #8617 from gtorodelvalle/dialer-bug-846261-cannot-delete-unknown-calls

Bug 846261 - [OPEN_][call log]some call log can not be delete.(617002041389) (r=jmcanterafonseca)
Merge pull request #8664 from alivedise/bugzilla/846262/close-inline-activities-when-screen-off

Bug 846262 - stop inline activities while lockscreen is locked, r=timdream
Bug 852075 - Reliable home button in inline activities
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
bug 851278 - exclude test stub apps from dogfood builds
Bug 851238 - Add icon to event template
Merge pull request #8706 from mykmelez/bug-851278

bug 851278 - exclude test stub apps from dogfood builds
Merge pull request #8686 from KevinGrandon/bug_851238_alarm_bell

Bug 851238 - Add icon to event template r=lightsofapollo
bug 851278 followup - remove obsolete dir from external apps dirs
Merge branch 'master' into bug-851278
Merge pull request #8707 from mykmelez/bug-851278

bug 851278 followup - remove obsolete dir from external apps dirs