Revert "Revert "Merge pull request #745 from arthurbenemann/osm""

This reverts commit f69a484bc5b637203783396ddda5396e9b9ba544.

Conflicts:
	Android/AndroidManifest.xml
	Android/src/org/droidplanner/android/activities/EditorActivity.java
	Android/src/org/droidplanner/android/mission/item/markers/MissionItemGenericMarkerSource.java
	Android/src/org/droidplanner/android/proxy/mission/item/MissionItemProxy.java
	Android/src/org/droidplanner/android/proxy/mission/item/markers/TakeoffMarkerInfo.java
bug fix: class name update.
restoring functionality omitted during the branch update.
code cleanup.
Matching functionality in current master. Updated the code so that 'takeoff' commands are not displayed on the map.
Adding support for spline paths as part of the map refactoring.
backend and frontend integration of spline waypoints completed.
cleaned up unused drawable resource.
updated spline waypoint icons, and mission list view.
added support for greenrobot event bus to the core project.
updated relevant core classes to broadcast drone events via the event bus.
added icons for the spline waypoint.
added mavlink version in the settings screen.
updated mission proxy generation of spline path points.
Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into drone_refactor_osm

Conflicts:
	Android/build.gradle
	Android/src/org/droidplanner/android/DroidPlannerApp.java
Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into drone_refactor_osm

Conflicts:
	Android/src/org/droidplanner/android/DroidPlannerApp.java
	Android/src/org/droidplanner/android/mission/MissionRender.java
	Android/src/org/droidplanner/android/mission/item/markers/MissionItemGenericMarkerSource.java
	Android/src/org/droidplanner/android/proxy/mission/item/MissionItemProxy.java
	Android/src/org/droidplanner/android/proxy/mission/item/fragments/MissionLoiterNFragment.java
update resulting from merge with upstream/master
updated android-studio, gradle tools, and android build tools to the latest version.
Updated gradle build files to provide support for android-studio v0.6.0
Merge pull request #795 from ne0fhyk/upstream_fix_gradle_update

Gradle build files update to support android-studio v0.6.0
Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into drone_refactor_osm
bug fixes.
Bug fixes for the editor tools:
- saved last selected editor tool so it can be retrieved after the fragment is recreated (i.e: after orientation switch). Before the selected tool would reset to the marker tool on orientation switch.
- exported commonly used code into functions.
- updated the editor tools view to reflect the selected tool after orientation switch.
- updated the editor activity to update the state of the tools on resume.
Bug fixes for the editor tools item detail window:
- updated editor activity so that reference to a displayed item detail window is retained across activity lifecycle events. Before that update, dismissing an item detail window after a lifecycle event (i.e: orientation switch) would leave the mission item in a selected state (instead of deselecting it), among other possible issues.

- updated the mission detail fragment to notify its listener/parent when it's being dismissed, when shown as a dialog.
Merge branches 'drone_refactor_osm' and 'fix_editor_tools' of https://github.com/ne0fhyk/droidplanner into drone_refactor_osm

Conflicts:
	Android/src/org/droidplanner/android/activities/EditorActivity.java
	Android/src/org/droidplanner/android/fragments/EditorToolsFragment.java
	Android/src/org/droidplanner/android/proxy/mission/item/fragments/MissionDetailFragment.java