Merge pull request #1145 from garvankeeley/updater-safety

Add safety checks to updater. Maybe overkill, best to be safe.
Update spanish translate
Merge pull request #1147 from rodmoreno/dev

Update spanish translate
Updated android/build.gradle
* the playstore release was stamped as 1.0, but it should have been
  1.02 to match the github release
Merge pull request #1163 from crankycoder/1.0-release-tagging

Updated android/build.gradle
Merge pull request #1 from mozilla/dev

Update from upstream
Added Sierra wireless aircard to blocklist
fix Play Store feature filtering
fix Play Store feature filtering
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.