Bug 820203 - Add Marionette to gaia-tests.zip, r=mwu
Merge pull request #62 from jonallengriffin/bug820203

Bug 820203 - Add Marionette to gaia-tests.zip, r=mwu
Removed unused opensans font from PRODUCT_PACKAGES
Bug 821194 - Let b2g.sh recover after a failed update by renaming /system/b2g.bak - r=dhylands
Merge pull request #63 from bjacob/updater

Bug 821194 - Let b2g.sh recover after a failed update by renaming /system/b2g.bak