update Gaia to 2013-07-31 tip of v1-train-integration branch
Merge branch 'master' into update-b2g-gaia
update B2G to 2013-07-31 tip of b2g18-simulator-integration branch
Merge branch 'master' into update-b2g-gaia
Merge pull request #767 from mykmelez/update-b2g-gaia

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