Merge remote-tracking branch 'origin/master'

OsmAnd/res/values/phrases.xml

@@ -251,6 +251,7 @@
 	<string name="poi_speed_camera">Speed camera</string>
 	<string name="poi_turning_circle">Turning circle</string>
 	<string name="poi_motorway_junction">Motorway junction</string>
+	<string name="poi_junction">Junction</string>
 	<string name="poi_rest_area">Rest area</string>
 
 	<string name="poi_water_well">Water well</string>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="rendering_attr_OSMMapperAssistant_name">OSM mapper assistant</string>
 	<string name="agps_info">A-GPS info</string>
 	<string name="shared_string_places">Places</string>
 	<string name="shared_string_search">Search</string>