Fix small issues
Fix NPE

Conflicts:
	OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
Prepare drawer menu for merge
Fix categories and checkbox
Fix categories and checkbox
add possibility for change layout
map settings dialog moved to drawer. Added possibility to set light and dark icon for map widgets

Conflicts:
	OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
Added new layouts
Fix NPE
Updated layout resources of map configuration. Renamed method to not having the same name.
Added new icons for dark and light widgets.
Fix for null pointer
Removed unused widgets
Updated layouts for configure map menu
Added descriptions for configure map
Change layout header.
Change sub_header.
Fix layout
Fix layout.
Fix layout sub_Header.