fixed issue #781
Merge pull request #797 from ne0fhyk/fix_issue_781

Fixed issue #781
Merge pull request #796 from ne0fhyk/fix_editor_tools

Fix editor tools bugs
Android: Fix the Circle Mode marker
Merge pull request #799 from arthurbenemann/drone_refactor_osm

OSM support
project libraries update.
Merge pull request #802 from ne0fhyk/feature_libraries_update

Project libraries update
Merge branch 'upstream_master' of https://github.com/ne0fhyk/droidplanner into glass
Merge branch 'upstream_master' of https://github.com/ne0fhyk/droidplanner into glass

Conflicts:
	Android/build.gradle