update B2G/Gaia to 2013-08-21 tips of b2g18-simulator-integration/v1-train-integration branches
Merge pull request #806 from mykmelez/update-b2g-gaia

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