Merge pull request #1 from mozilla/dev

Update from upstream
Added Sierra wireless aircard to blocklist
Changed tabs to spaces
Corrected case of OUI
Merge pull request #1172 from mishari/dev

Added Sierra Wireless OUI to blocklist
Added null pointer checks to getting wifi manager and scan result. In theory neither of these should have ever been null.
1185 NPE Reporter.startup (no telephony manager)
#1185
If TelephonyManager is null, just return.
1187 - NPE - Appears to be from no app context
The line nuns in the report don't match exactly, but it appears to be a null app context is causing this.
#1187
Merge pull request #1179 from cascheberg/fix-metrics

@cascheberg Always update metrics last upload time label
Explicitly set the mPhoneType to .PHONE_TYPE_NONE;
A minor visual improvement was done on the Drawer.

The upload reports button was added to the bottom together with a new preferences button.

The preferences shortcut still remains on the overflow menu.

This feature is working on landscape and portarit mode as well and the buttons on the drawer remain always visible.
Removed setting menu item because now it is on the drawer
update translations
remove ocpsoft PrettyTime dependency
Merge pull request #1192 from garvankeeley/1169-acra-npe-wifi

1169: ACRA Report: NPE WifiScanner.java:98
Merge pull request #1194 from garvankeeley/1185-npe-reporter-get-telephony

1185 NPE Reporter.startup (no telephony manager)
Merge pull request #1195 from garvankeeley/1187-npe-wifiscanner44

1187 - NPE - Appears to be from no app context
1190 NPE FirstRunFragment:50
This line number is where getDialog() is assumed to return a non-null, fixed.
Merge pull request #1203 from garvankeeley/1190-npe-firstrunfragment-getdialog

1190 NPE FirstRunFragment:50
Merge pull request #1198 from cascheberg/translations

@cascheberg keep_screen_on_summary added and update translations