Merge branch 'dev' into features/1191-merged

Conflicts:
	android/src/main/java/org/mozilla/mozstumbler/client/subactivities/DeveloperActivity.java
	android/src/main/res/layout/fragment_developer_options.xml