Merge pull request #6960 from asutherland/email-evict-data-clear-caches

Bug 799828 - [email/IMAP] data eviction from cache; discard messages outside sync window periodically. r=squib, a=blocking-basecamp
Merge pull request #6908 from lissyx/bug819695-clock

Bug 819695 - Fix clock display on lockscreen and homescreen, r=kaze
Bug 816922 - [email/activesync] Improve error handling and logging; r=asuth, a=blocking-basecamp
Merge pull request #6962 from mozsquib/email-activesync-error-handling

Bug 816922 - [email/activesync] Improve error handling and logging
Only show two panels at a time.
Merge pull request #6909 from KevinGrandon/bug-819247-settings-panel

Bug 818056 - Workaround for setting panel layering
Revert "Merge pull request #6843 from albertopq/dialer-818354"

This reverts commit ce6d3440a119e0e4e4354eb5332f1e3d51c4b855, reversing
changes made to 2b436ac85a52ea98976a0ae7ffb2126a3cd05019.
Merge pull request #6827 from jmcanterafonseca/fix_perf_search_PR

Bug 816742 - [facebook] search during the import  slows to a crawl when ...
Merge pull request #6919 from bakulf/airplane

Bug 796447 - [Settings] Mobile Data settings should never be on in Airplane Mode, r=timdream, evelynhung, a=blocking-basecamp+
Bug 815875: Re-enable the code to prevent scroll headers in sub-panels. r=gal a=cjones
[Bug 820328] Update clear button design and behavior to feel more native [r=crdlc]
bug 817286: l10n.js failed if locale ini imports non-exist propertie files
Merge pull request #6952 from fabi1cazenave/l10n-218

bug 817286: l10n.js failed if locale ini imports non-exist propertie files, r=schung
Bug 816563 - Getting FB contacts in Dialer r=jmcantera
Bug 820670 - [Homescreen][Everything.me] click on the link to background page source will eat home screen app [r=ran]
[816466] Icons needed on import screen (r=@borjasalguero)
Merge pull request #6881 from ttaubert/browser/bug-819277-top-sites-without-screenshots

Bug 819277 - [Browser] missing thumbnails when a place has no screenshot
Bug 799828 - [email] Add a missing parameter to scheduleMessagePurge. r=asuth, a=blocking-basecamp

Land squib's fix from:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/98
Merge pull request #6978 from asutherland/email-fix-message-purge

Bug 799828 - [email] Add a missing parameter to scheduleMessagePurge. r=asuth, a=blocking-basecamp
Merge pull request #6970 from jmcanterafonseca/bug_dialer_end

Bug 816563 - Getting FB contacts in Dialer r=jmcantera, albertopq