Refactor native
Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Conflicts:
	OsmAnd/res/layout-large/main.xml