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

update B2G/Gaia to 2013-07-17 tips of b2g18/v1-train branches