Changed prefs to getInstance(c) and the less-safe,
getInstanceWithoutContext()
Merge branch 'dev' of https://github.com/garvankeeley/MozStumbler into port-changes-from-fennec
Missed a change in the tests
build num 1.5.4
Merge pull request #1347 from garvankeeley/dev

build num 1.5.4
removed unused string (according to lint)
Merge pull request #1348 from garvankeeley/fix-strings

removed unused string (according to lint)
Merge pull request #1346 from garvankeeley/port-changes-from-fennec

Changed prefs to getInstance(Context) and the less-safe getInstanceWithoutContext()
Merge branch 'dev' into features/1191-new-merge

Conflicts:
	android/src/main/java/org/mozilla/mozstumbler/client/ClientPrefs.java
	android/src/main/java/org/mozilla/mozstumbler/client/MainApp.java
	android/src/main/java/org/mozilla/mozstumbler/client/subactivities/DeveloperActivity.java
	android/src/main/java/org/mozilla/mozstumbler/service/Prefs.java
	android/src/main/java/org/mozilla/mozstumbler/service/core/http/HttpUtil.java