Bug 813079 - Edit Mode. Need to increase responsiveness when dragging icons around page and moving them through pages or to dock [r=vingtetun]
Bug 796381 - About should expose IMEI, ICCID, MSISDN
[Bug 824704] Make sure locale and timezone are always up to date [r=vingtetun]
Bug 824999 - Do not strip frames from animated PNG images
Bug 811745 - Polishing Settings Display & Polishing Wallpaper picker
Bug 825327 - Don't mess with the navBar after we've started the tutorial.
[Bug 825577] fix cache [r=vingtetun]
[Bug 824442] Fix installed apps design line duplication [r=vingtetun]
Fixed issues in clock app
[system | date picker | app windows] px to rem
Merge branch 'ready-for-scale-inprogress' into twist-nightly
Bug 823669 - [B2G][Email]Activesync: Emails deleted on the web client do not sync to the device; r=asuth, a=blocking-basecamp
Merge pull request #7263 from mozsquib/email-as-delete

Bug 823669 - [B2G][Email]Activesync: Emails deleted on the web client do not sync to the device
Bug 821447 - Email with no subject displays "undefined" (fix fallout from original commit)
Bug 796824 - Add the removed trailing space
PerApp test helpers a=test-only r=etienne_s
Bug 823675 - Replaced clock app icon with dark version
Bug 818928 - Video dialog tweak, added gray spec'd dialog, made some minor font tweaks, like removing references to bold

Conflicts:
	apps/video/style/video.css
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge pull request #7267 from lightsofapollo/per-app-test-helpers

PerApp test helpers a=test-only r=etienne_s