merge b2g-18 camera patch
multiresolution fix: [gallery] set a default width/height to .thumbnail in case of unknown resolution
multiresolution fix: [clock] Fix incorrect timepicker position
Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "Looking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround); r=asuth, a=blocking-basecamp