Fix issues
Merge branch 'drawer' of ssh://github.com/osmandapp/Osmand into drawer