Bug 823496 - [CONTACTS][FACEBOOK] If you link a contact with company filled with a facebook contact with company filled, you see both in contact list but not in contact details [r=jmcanterafonseca]
Merge pull request #7088 from crdlc/bug-org-friend

Bug 822968 - [CONTACTS][FACEBOOK] Company name is not updated in contact...
Merge pull request #6945 from EverythingMe/loading-shortcuts-progress

[Bug 820361] Update loading indicator in shortcuts loading [r=crdlc]
Merge pull request #6616 from EverythingMe/bgufix-bgimage

[Bug 814949] Fix background image to be visible again [r=crdlc]
Merge pull request #6949 from EverythingMe/bugfix-helper-cut

[Bug 820382] bugfix - helper cut text [r=crdlc]
bug 823540: use absolute URLs for the shared resources in the Camera app
Merge pull request #7109 from crdlc/bug-823496

Bug 823496 - [CONTACTS][FACEBOOK] If you link a contact with company fil...
Merge pull request #6942 from EverythingMe/clear-button

[Bug 820328] Update clear button design and behavior [r=crdlc]
Merge pull request #6972 from EverythingMe/bugfix-folder-apps-space

[Bug 820783] Smart Folder- fix space between apps and header [r=crdlc]
[Bug 822630] [contacts] Possible CSP problems
Merge pull request #6943 from EverythingMe/installed-tweaks

[Bug 820333] Offline Apps tweaks [r=crdlc]
[Bug 820728] fix duplicate shortcuts on More [r=crdlc]
Merge pull request #7111 from fabi1cazenave/camera-shared-stuff

bug 823540: use absolute URLs for the shared resources in the Camera app, r=ochameau
Merge remote-tracking branch 'upstream/master' into l10n-precompile
Merge pull request #6965 from EverythingMe/bugfix-shrtct-more

[Bug 820728] fix duplicate shortcuts on More [r=crdlc]
calendar love
Bug 820863 - Disable usage of the entry points property by third party apps during app install
Bug 821221: Add opacity:0.99 to "Deselect all" / "Select all" buttons in SMS edit-conversation view, to hack around bug with button-label not painting.
Merge pull request #7098 from lightsofapollo/822626

Bug 822626 - Fix l10n id on html button but not on the span, a=lmorchard
Bug 823355 - [Settings] There is nothing in 'Select a tone' page when changing the ring tone.