Add OnniBus.com on-bus wifi to blocklist
Added ScrollView to the activity_about.xml
Merge pull request #665 from kallelampila/master

Add OnniBus.com on-bus wifi to blocklist (@kallelampila)
Prevent crash

While not using the stumbler, a dialog would still pop up saying that the stumbler
had crashed:

E/AndroidRuntime(25424): Caused by: java.lang.NullPointerException
E/AndroidRuntime(25424):        at org.mozilla.mozstumbler.service.StumblerService.onStartCommand(StumblerService.java:138)
E/AndroidRuntime(25424):        at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:2729)
E/AndroidRuntime(25424):        ... 10 more

This is annoying to users, so should be stopped.
Merge pull request #673 from keverets/stop-crash

Prevent crash
Remove check for a specfic intent, any start intent is acceptable, and
these might change as we add more
Merge pull request #674 from garvankeeley/remove-intent-check

Passive Stumbler: Remove check for a specific start intent
Bug 1024708 - Pre: Add MPLv2 license headers to code that ships with Fennec.
Merge pull request #675 from ncalexan/nalexander/license-headers

Bug 1024708 - Pre: Add MPLv2 license headers to code that ships with Fennec.
Update SSIDBlockList.java
Update SSIDBlockList.java
Merge pull request #666 from JiMMaR/master

Added ScrollView to the activity_about.xml #621
Merge pull request #676 from rodmoreno/master

Update SSIDBlockList.java
try to preserve old preferenes on upgrade
Merge pull request #677 from garvankeeley/fix-prefs

try to preserve old prefs on upgrade
fix missing import on prev commit
Merge pull request #678 from garvankeeley/fix-prefs

fix missing import on prev commit
Persist the "Upload only on wifi" preference
Always do as the user requested with respect to the Geofence Enabled switch

Previously, it would only turn off in a very specific circumstance.  After
this change, it should always set the geofence enabled to what the user selected.
Merge pull request #680 from keverets/wifi-only-persist

Persist the "Upload only on WiFi" and the "Geofencing" preference