Merge branch 'geminiScanner' of github.com:illarionov/MozStumbler into develop

Conflicts:
	res/values/strings.xml
	res/xml/preferences.xml
	src/org/mozilla/mozstumbler/preferences/Prefs.java
Merge branch 'acra' of github.com:illarionov/MozStumbler into develop

Conflicts:
	res/values/strings.xml
Merge branch 'disableAlert' of github.com:illarionov/MozStumbler into develop