Import style editor via prosthesis.
Introduce devtool toolbox per app.
Merge branch 'toolbox-per-app' of git://github.com/ochameau/r2d2b2g into ochameau-toolbox-per-app
Ignore apps not being tracked by the simulator.
Merge branch 'toolbox-per-app' of git://github.com/ochameau/r2d2b2g into ochameau-toolbox-per-app
Fix app manifestURL being broken for packaged app before 4.0pre5
Merge branch 'toolbox-per-app' of git://github.com/ochameau/r2d2b2g into ochameau-toolbox-per-app
Merge branch 'master' into ochameau-toolbox-per-app
Merge branch 'master' into ochameau-toolbox-per-app
Introduce devtool toolbox per app.
Remove connect button and update addon version range for fixing manifestURLs
Merge branch 'toolbox-per-app' of git://github.com/ochameau/r2d2b2g into ochameau-toolbox-per-app

Conflicts:
	addon/lib/main.js
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	addon/data/content/index.html
	addon/lib/simulator.js
Always display connect button and ensure running the simulation and the app before opening the toolbox.
Display a message in webconsole when a new toolbox is opened.
Merge branch 'toolbox-per-app' of git://github.com/ochameau/r2d2b2g into ochameau-toolbox-per-app
Merge branch 'master' into ochameau-toolbox-per-app
Merge remote-tracking branch 'upstream/master' into HEAD
Revert gaia modification.
Merge branch 'toolbox-per-app' of git://github.com/ochameau/r2d2b2g into ochameau-toolbox-per-app