Fix compilation issues'
Merge branch 'master' of ssh://github.com/osmandapp/Osmand