Fix local app icon path on Windows. Fixes #548.
update Gaia to 2013-06-19 tip of v1-train
update B2G to 2013-06-19 tip of b2g18 branch
Merge pull request #646 from mykmelez/update-b2g-gaia

update B2G/Gaia to 2013-06-19 tips of b2g18/v1-train branches
Merge branch 'local-icons' of git://github.com/ochameau/r2d2b2g into ochameau-local-icons
fix nits