Cleanup
Merge branch 'master' of https://github.com/osmandapp/OsmAnd-resources

Conflicts:
	rendering_styles/default.render.xml