Add layer __2 and _5 for more complex cases
Merge branch 'master' of ssh://github.com/osmandapp/Osmand