Solve Issue 2233: Routing instructions disappearing too early in roundabouts
Keep track of the end for directions that are not spots (like roundabouts).
Then use this information to keep on this directions until we reach their end.
Has a strange side effect. Distance drop as we arrive to start of roundabout
(like previously) and when entering roundabout grow up to roundabout distance.

	modified:   src/net/osmand/plus/routing/RouteCalculationResult.java
	modified:   src/net/osmand/plus/routing/RouteDirectionInfo.java
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
Add support for determining the actual turn to be taken based on the lanes highlighted
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
Assign new turn in attachKeepLeftInfoAndLanes()
Switch primary and secondary turns if the secondary turn is the actual turn
Updated layouts for configure map menu
Added descriptions for configure map
New icons for change waypoint order.