test
Conflicts:
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java
context menu
Conflicts:
	OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
update layer list
Conflicts:
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java
color of points
Conflicts:
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidLayer.java
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPoint.java
lf
Conflicts:
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidLayer.java
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java
	OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPoint.java
trace