Introducing WiFi only uploading.
Fixes following @cpeterso's requests.
Basic geofencing.
Update LocationBlockList.java
Fixing up the GPSScanner block.
Merge remote-tracking branch 'origin/dev2' into dev2

Conflicts:
	src/org/mozilla/mozstumbler/GPSScanner.java