update Gaia to 2013-08-07 tip of v1-train-integration branch
update B2G to 2013-08-07 tip of b2g18-simulator-integration branch
Merge pull request #780 from mykmelez/update-b2g-gaia

update B2G/Gaia to 2013-08-07 tips of b2g18-simulator-integration/v1-train-integration branches