Start using gaia's desktop helper to fix touch events and gain API mocks.
Merge branch 'use-desktop-helper' of git://github.com/ochameau/r2d2b2g into ochameau-use-desktop-helper

Conflicts:
	Makefile
Start using gaia's desktop helper to fix touch events and gain API mocks.
update B2G/Gaia to 2013-05-22 tips of b2g18/v1-train branches
Merge branch 'master' into update-b2g-gaia
Merge pull request #552 from mykmelez/update-b2g-gaia

update B2G/Gaia to 2013-05-22 tips of b2g18/v1-train branches
Merge branch 'master' into ochameau-use-desktop-helper
Merge branch 'use-desktop-helper' of git://github.com/ochameau/r2d2b2g into ochameau-use-desktop-helper

Conflicts:
	Makefile
Request changes from jetpack 1.14 not master
Merge pull request #554 from bkase/bugfix-request-too-new
Merge branch 'master' into ochameau-use-desktop-helper
Fix regression introduced by PR #510. Fixes #555.
Move all manifest validation logic to /addon/lib/validator.js and unit
test it.
Removed b2g-content.css
Merge pull request #549 from ochameau/validator

Move all manifest validation logic to /addon/lib/validator.js and unit test it.
Merge branch 'fix-510' of git://github.com/ochameau/r2d2b2g into ochameau-fix-510
correct paths to which Gaia XPIs must be written
Merge pull request #559 from bkase/fix-redundant-sheet

Removed redundant b2g-content.css
update version for 4.0pre3 build
update version for 4.0pre4dev development