Bug 847566 - Developing in the browser is painful. r=kgrandon
Bug 847566 - Improve developer extension
Bug 847566 - Use real mozSettings and defaults from profile
Bug 860344 - Define mocks based on document domain

Instead of inferring the document's domain from the `location` object,
query the global `document.domain` string. This approach acheives the
desired behavior for iFrames that do not declare a `src` attribute (in
such cases, `location.toString()` yeilds "about:blank", but
`document.domain` correctly returns the domain of the parent document.
Bug 847566 - Implement developer tools with hardware options.
Bug 847566 - Automatically shows system app and ffos devtool when running on Firefox.
Bug 860842 - Ensure the desktop-helper use embed-apps and browser permissions for the system app. r=kgrandon
Bug 860866 - Implement manifest parser
Bug 861171 - Remove idle/devicestorage and the apps/ folder of the desktop-helper extension. r=kgrandon
Bug 861180 - Remove power shim r=vingtetun
Bug 861236 - Add keyboard support for the desktop-helper. r=kgrandon
Bug 861424 - Bump maxVersion in gaia extension install.rdf's, r=vingtetun
Bug 861494 - Add activities support to desktop-helper if the runtime support MozActivity. r=kgrandon
Bug 861494 - Fix timing issue with activity.
Bug 862453 - Quick hack to disable frame scripts from unit tests
Bug 862758 - Add mozAlarms support to the desktop-helper. r=kgrandon
Bug 863648 - Implement simple application reload control.
Bug 863318 - Add l10-fixes to the desktop-helper. r=kgrandon
Bug 835774 - [Building Blocks] [Filters] Left border should be removed
(cherry picked from commit 352ef946693d267d997b709fcc03537710289ec9)
Bug 834446 - [Browser] Truncated Bookmark Label

Conflicts:
	apps/browser/style/browser.css

(cherry picked from commit 63149e661d59b024aceb245d9085cfb29be2a42f)