Merge branch 'dev' of https://github.com/garvankeeley/MozStumbler into kml_io_4

Conflicts:
	android/src/main/java/org/mozilla/mozstumbler/client/mapview/ObservationPoint.java
	android/src/main/java/org/mozilla/mozstumbler/client/mapview/ObservationPointsOverlay.java