Bug 826211 - correct container size for gallery pick/crop activity
Merge pull request #8244 from davidflanagan/bug826211

Bug 826211 - correct container size for gallery pick/crop activity r=djf
Bug 843736 - [sms] Application broken when running with FF18

In FireFox 18, the global `navigator` object has a `mozSettings`
attribute, but it is set to `null`. In order to properly test with
FireFox, code that attempts to reference properties of
`navigator.mozSettings` should check that this value is non-null.

r=kgrandon
Merge pull request #8245 from jugglinmike/fix-sms-on-ff18

Bug 843736 - [sms] Application broken when running with FF18 r=kgrandon
Bug 841711 - httpd.js extension in DEBUG=1 profiles is broken in current nightly r=fabrice

* Load dbg-client.jsm from the correct URI in new Firefox
* bumped up the version