Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into dp_3dr_services

Conflicts:
	Android/src/org/droidplanner/android/activities/helpers/SuperUI.java
	Android/src/org/droidplanner/android/fragments/CopterFlightActionsFragment.java
	Android/src/org/droidplanner/android/proxy/mission/item/fragments/MissionStructureScannerFragment.java
	Android/src/org/droidplanner/android/proxy/mission/item/fragments/MissionSurveyFragment.java