Revert "UI Action bar cleanup"
Merge pull request #1223 from DroidPlanner/revert-1218-ui_cleanup

Revert "UI Action bar cleanup"
Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into dp_3dr_services

Conflicts:
	Android/src/org/droidplanner/android/activities/EditorActivity.java
	Android/src/org/droidplanner/android/activities/FlightActivity.java
	Android/src/org/droidplanner/android/activities/helpers/SuperUI.java
	Android/src/org/droidplanner/android/fragments/EditorListFragment.java
	Android/src/org/droidplanner/android/proxy/mission/item/fragments/MissionDetailFragment.java