fix
Merge branch 'master' of github.com:andresfcalderon/FirefoxOS-XbIO