CB-3208 FFOS fix 1.1

* updates dev branch
* fixes support for FirefoxOS 1.1