Index: /applications/editors/josm/plugins/CommandLine/src/CommandLine/AnyAction.java
===================================================================
--- /applications/editors/josm/plugins/CommandLine/src/CommandLine/AnyAction.java	(revision 27550)
+++ /applications/editors/josm/plugins/CommandLine/src/CommandLine/AnyAction.java	(revision 27551)
@@ -130,5 +130,5 @@
 			if (!Main.isDisplayingMapView())
 				return;
-			nearestPrimitive = Main.map.mapView.getNearest(mousePos, OsmPrimitive.isUsablePredicate); // Deprecated
+			nearestPrimitive = Main.map.mapView.getNearestNodeOrWay(mousePos, OsmPrimitive.isUsablePredicate, false);
 			if (nearestPrimitive != null) {
 				setCursor(cursorActive);
Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 27550)
+++ /applications/editors/josm/plugins/build.xml	(revision 27551)
@@ -32,4 +32,5 @@
         <ant antfile="build.xml" target="dist" dir="gpxfilter"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
+        <ant antfile="build.xml" target="dist" dir="HouseNumberTaggingTool"/>
         <ant antfile="build.xml" target="dist" dir="imageryadjust"/>
         <ant antfile="build.xml" target="dist" dir="imagery-xml-bounds"/>
@@ -37,5 +38,4 @@
         <ant antfile="build.xml" target="dist" dir="ImportImagePlugin"/>
         <ant antfile="build.xml" target="dist" dir="importvec"/>
-        <ant antfile="build.xml" target="dist" dir="ImproveWayAccuracy"/>
         <ant antfile="build.xml" target="dist" dir="infomode"/>
         <ant antfile="build.xml" target="dist" dir="irsrectify"/>
@@ -46,4 +46,5 @@
         <ant antfile="build.xml" target="dist" dir="mapdust"/>
         <ant antfile="build.xml" target="dist" dir="measurement"/>
+        <ant antfile="build.xml" target="dist" dir="merge-overlap"/>
         <ant antfile="build.xml" target="dist" dir="michigan_left"/>
         <ant antfile="build.xml" target="dist" dir="multipoly-convert"/>
@@ -72,4 +73,5 @@
         <ant antfile="build.xml" target="dist" dir="smed"/>
         <ant antfile="build.xml" target="dist" dir="surveyor"/>
+        <ant antfile="build.xml" target="dist" dir="surveyor2"/>
         <ant antfile="build.xml" target="dist" dir="tag2link"/>
         <ant antfile="build.xml" target="dist" dir="tageditor"/>
@@ -91,5 +93,4 @@
     <target name="build_defect" depends="compile">
         <ant antfile="build.xml" target="dist" dir="rgisopen"/>
-        <ant antfile="build.xml" target="dist" dir="smed_bfw"/>
         <ant antfile="build.xml" target="dist" dir="trustosm"/>
     </target>
@@ -118,4 +119,5 @@
         <ant antfile="build.xml" target="clean" dir="gpxfilter"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
+        <ant antfile="build.xml" target="clean" dir="HouseNumberTaggingTool"/>
         <ant antfile="build.xml" target="clean" dir="imageryadjust"/>
         <ant antfile="build.xml" target="clean" dir="imagery-xml-bounds"/>
@@ -123,5 +125,4 @@
         <ant antfile="build.xml" target="clean" dir="ImportImagePlugin"/>
         <ant antfile="build.xml" target="clean" dir="importvec"/>
-        <ant antfile="build.xml" target="clean" dir="ImproveWayAccuracy"/>
         <ant antfile="build.xml" target="clean" dir="infomode"/>
         <ant antfile="build.xml" target="clean" dir="irsrectify"/>
@@ -132,4 +133,5 @@
         <ant antfile="build.xml" target="clean" dir="mapdust"/>
         <ant antfile="build.xml" target="clean" dir="measurement"/>
+        <ant antfile="build.xml" target="clean" dir="merge-overlap"/>
         <ant antfile="build.xml" target="clean" dir="michigan_left"/>
         <ant antfile="build.xml" target="clean" dir="multipoly-convert"/>
@@ -158,6 +160,6 @@
         <ant antfile="build.xml" target="clean" dir="simplifyarea"/>
         <ant antfile="build.xml" target="clean" dir="smed"/>
-        <!--<ant antfile="build.xml" target="clean" dir="smed_bfw"/>-->
         <ant antfile="build.xml" target="clean" dir="surveyor"/>
+        <ant antfile="build.xml" target="clean" dir="surveyor2"/>
         <ant antfile="build.xml" target="clean" dir="tag2link"/>
         <ant antfile="build.xml" target="clean" dir="tageditor"/>