Small bugs and improvements (number of tracks)
Merge branch 'master' of ssh://github.com/osmandapp/Osmand