Fix layout.
Fix layout sub_Header.
Fix layout.
Merge branch 'drawer' of github.com:osmandapp/Osmand into drawer

Conflicts:
	OsmAnd/res/layout/drawer_list_sub_header.xml