Refactor
Merge branch 'master' of ssh://github.com/osmandapp/OsmAnd-core

Conflicts:
	CMakeLists.txt
	embed-resources.sh
	embeddable-resources/.gitignore
	src/EmbeddedResources_bundle.cpp
swig directory
Fix android
Fix android
Fix
Partial fix
fix
fix
Link order