Borrado place holder
Merge branch 'master' of https://github.com/Daniseijo/FirefoxOSRepo