Less bad
Merge branch 'master' of https://github.com/xfausto/MediaCrush-FirefoxOS