Merge branch 'master' into beta

Author: arthurbenemann

Android/src/org/droidplanner/android/fragments/EditorToolsFragment.java

@@ -46,7 +46,7 @@ public interface OnEditorToolSelected {
 
 	private OnEditorToolSelected listener;
 	private RadioGroup mEditorRadioGroup;
-	private EditorTools tool;
+	private EditorTools tool = EditorTools.NONE;
 	private MissionProxy mMissionProxy;
 
 	@Override