Merge pull request #1 from mozilla/dev

Update from upstream
Added Sierra wireless aircard to blocklist
Merge pull request #1173 from cascheberg/fix

@cascheberg fix Play Store feature filtering: telephony not required
Added build flavour support to different app stores (google play, github and fdroid now supported)
Fix for #1016: Added support to rewrite the Android versionName and versionCode on the fly without touching the original AndroidManifest.xml so that we're not changing it every version bump.
Swapped out the github mozilla-services Ivy repository in preference for jcenter to satisfy f-droid requirements.
Test target wasn't using product flavor
Merge pull request #1177 from crankycoder/features/1025-fdroid

Features/1025 fdroid
added product flavor to the debug and install_debug targets
Changed tabs to spaces
Corrected case of OUI
always update metrics last upload time
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
periodically update metrics last upload time
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