Worked twice.
Merge remote-tracking branch 'origin/ToggleWidget' into ToggleWidget

Conflicts:

	android/src/main/java/org/mozilla/mozstumbler/client/widgets/ToggleWidgetProvider.java
	android/src/main/res/layout/toggle_widget.xml