Merge branch 'dev' into features/957-merge-dev

Conflicts:
	android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapFragment.java
	android/src/main/java/org/mozilla/mozstumbler/service/core/http/HTTPResponse.java
	android/src/main/java/org/mozilla/mozstumbler/service/core/http/IResponse.java