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 pull request #7267 from lightsofapollo/per-app-test-helpers

PerApp test helpers a=test-only r=etienne_s
Bug 825831 - "User Guide" link in Settings app always points to en-US URL r=kaze

Always use the unlocalized URL for the user guide.
Merge pull request #6653 from guiora/bug-811745-rebase

Bug 811745 - polishing wallpaper
[VKB] <input type='number'> VKB should allow negative numbers
Merge pull request #7270 from vingtetun/796610

[VKB] <input type='number'> VKB should allow negative numbers
Bug 825893 - 1px extra border on the left side of the passcode
Merge pull request #7269 from gordonbrander/ux-2012-12-28-cherry-picked

Ux 2012 12 28 cherry picked
Merge pull request #7265 from crh0716/fix_796824

Bug 796824 - Add the removed trailing space
Merge pull request #7255 from EverythingMe/bugfix-cache

[Bug 825577] fix cache [r=vingtetun]
Merge pull request #7226 from gabrielesvelto/bug-824999

Bug 824999 - Do not strip frames from animated PNG images
Merge pull request #7253 from EverythingMe/bugfix-resultlines

[Bug 824442] Fix installed apps design line duplication [r=vingtetun]
Merge pull request #7193 from EverythingMe/api-clientinfo

[Bug 824704] Make sure locale and timezone are up to date [r=vingtetun]
Merge pull request #6916 from crdlc/bug-813079

Bug 813079 - Edit Mode. Need to increase responsiveness when dragging ic...
Bug 825868 - The APN.json database is forked in the FTU app