CB-3208
* updates dev branch
* fixes support for FirefoxOS 1.1
Merge pull request #3 from zalun/ffos-fix-1.1

CB-3208 FFOS fix 1.1