update Gaia to 2013-05-15 tip of v1-train
update B2G to 2013-05-15 tip of b2g18 branch (w/icon fix bug 865210)
Merge pull request #533 from mykmelez/update-b2g-gaia

update B2G/Gaia to 2013-05-15 tips of b2g18/v1-train branches (w/pending fix)