Index: /applications/editors/josm/plugins/CommandLine/build.xml
===================================================================
--- /applications/editors/josm/plugins/CommandLine/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/CommandLine/build.xml	(revision 25199)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Moar bugfixes" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3826" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/DirectDownload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
     <property name="commit.message" value="Commit message" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3592" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])" />
-	<property name="plugin.main.version" value="3338" />
+	<property name="plugin.main.version" value="3835" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 25199)
@@ -25,5 +25,5 @@
 
 	<property name="commit.message" value="Impoved Icon" />
-	<property name="plugin.main.version" value="3514" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!--
Index: /applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- /applications/editors/josm/plugins/alignways/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/alignways/build.xml	(revision 25199)
@@ -36,5 +36,5 @@
 		with
 	-->
-	<property name="plugin.main.version" value="3600" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/build.xml	(revision 25199)
@@ -14,5 +14,6 @@
         <ant antfile="build.xml" target="dist" dir="colorscheme"/>
         <ant antfile="build.xml" target="dist" dir="ColumbusCSV"/>
-		<ant antfile="build.xml" target="dist" dir="CommandLine"/>
+        <ant antfile="build.xml" target="dist" dir="CommandLine"/>
+        <ant antfile="build.xml" target="dist" dir="contourmerge"/>
         <ant antfile="build.xml" target="dist" dir="Create_grid_of_ways"/>
         <ant antfile="build.xml" target="dist" dir="czechaddress"/>
@@ -29,4 +30,5 @@
         <ant antfile="build.xml" target="dist" dir="gpxfilter"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
+        <ant antfile="build.xml" target="dist" dir="imageryadjust"/>
         <ant antfile="build.xml" target="dist" dir="imagewaypoint"/>
         <ant antfile="build.xml" target="dist" dir="ImportImagePlugin"/>
@@ -37,5 +39,4 @@
         <ant antfile="build.xml" target="dist" dir="measurement"/>
         <ant antfile="build.xml" target="dist" dir="michigan_left"/>
-        <ant antfile="build.xml" target="dist" dir="multipoly"/>
         <ant antfile="build.xml" target="dist" dir="multipoly-convert"/>
         <ant antfile="build.xml" target="dist" dir="nearclick"/>
@@ -54,4 +55,5 @@
         <ant antfile="build.xml" target="dist" dir="routes"/>
         <ant antfile="build.xml" target="dist" dir="routing"/>
+        <ant antfile="build.xml" target="dist" dir="scripting"/>
         <ant antfile="build.xml" target="dist" dir="simplifyarea"/>
         <ant antfile="build.xml" target="dist" dir="smed"/>
@@ -88,4 +90,5 @@
         <ant antfile="build.xml" target="clean" dir="colorscheme"/>
         <ant antfile="build.xml" target="clean" dir="CommandLine"/>
+        <ant antfile="build.xml" target="clean" dir="contourmerge"/>
         <ant antfile="build.xml" target="clean" dir="Create_grid_of_ways"/>
         <ant antfile="build.xml" target="clean" dir="czechaddress"/>
@@ -100,4 +103,5 @@
         <ant antfile="build.xml" target="clean" dir="gpxfilter"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
+        <ant antfile="build.xml" target="clean" dir="imageryadjust"/>
         <ant antfile="build.xml" target="clean" dir="imagewaypoint"/>
         <ant antfile="build.xml" target="clean" dir="ImportImagePlugin"/>
@@ -109,5 +113,4 @@
         <ant antfile="build.xml" target="clean" dir="measurement"/>
         <ant antfile="build.xml" target="clean" dir="michigan_left"/>
-        <ant antfile="build.xml" target="clean" dir="multipoly"/>
         <ant antfile="build.xml" target="clean" dir="multipoly-convert"/>
         <ant antfile="build.xml" target="clean" dir="nearclick"/>
@@ -127,4 +130,5 @@
         <ant antfile="build.xml" target="clean" dir="routes"/>
         <ant antfile="build.xml" target="clean" dir="routing"/>
+        <ant antfile="build.xml" target="clean" dir="scripting"/>
         <ant antfile="build.xml" target="clean" dir="simplifyarea"/>
         <ant antfile="build.xml" target="clean" dir="smed"/>
Index: /applications/editors/josm/plugins/contourmerge/build.xml
===================================================================
--- /applications/editors/josm/plugins/contourmerge/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/contourmerge/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Updating to JOSM 3210" />
-	<property name="plugin.main.version" value="3210" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!--
Index: /applications/editors/josm/plugins/epsg31287/build.xml
===================================================================
--- /applications/editors/josm/plugins/epsg31287/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/epsg31287/build.xml	(revision 25199)
@@ -37,5 +37,5 @@
     <property name="commit.message" value="fixed proj4 Parameters (thanks to Hetzi + Mikael Rittri)" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3779" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/ext_tools/build.xml
===================================================================
--- /applications/editors/josm/plugins/ext_tools/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/ext_tools/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="show error if script cannot be executed" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="3403" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- /applications/editors/josm/plugins/graphview/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/graphview/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="option to change graph colors; closes ticket 5523 in JOSM Trac" />
-	<property name="plugin.main.version" value="3576" />
+	<property name="plugin.main.version" value="3835" />
 
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/imageryadjust/build.xml
===================================================================
--- /applications/editors/josm/plugins/imageryadjust/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/imageryadjust/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
     <property name="commit.message" value="Commit message" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3715" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/irsrectify/build.xml
===================================================================
--- /applications/editors/josm/plugins/irsrectify/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/irsrectify/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
     <property name="commit.message" value="New plugin - irsrectify" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3715" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- /applications/editors/josm/plugins/mapdust/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/mapdust/build.xml	(revision 25199)
@@ -4,5 +4,5 @@
 	<!-- properties -->
 	<property name="commit.message" value="MapDust bug reporter plugin" />
-	<property name="plugin.main.version" value="3592" />
+	<property name="plugin.main.version" value="3835" />
 	<property name="josm" location="../../core/dist/josm-custom.jar"/>
 	<property name="plugin.build.dir" value="build/classes" />
Index: /applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- /applications/editors/josm/plugins/measurement/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/measurement/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="3408" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="3416" />
+	<property name="plugin.main.version" value="3835" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/photo_geotagging/build.xml
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 25199)
@@ -27,5 +27,5 @@
 	<property name="commit.message" value="fixed josm bug 5800 - 'Override old backup files?' message window can't get focus" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="3752" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- /applications/editors/josm/plugins/piclayer/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/piclayer/build.xml	(revision 25199)
@@ -24,5 +24,5 @@
 
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="3408" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!--
Index: /applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="2830" />
+	<property name="plugin.main.version" value="3835" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/restart/build.xml
===================================================================
--- /applications/editors/josm/plugins/restart/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/restart/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
     <property name="commit.message" value="Commit message" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3000" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/routes/build.xml
===================================================================
--- /applications/editors/josm/plugins/routes/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/routes/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="3565" />
+	<property name="plugin.main.version" value="3835" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/routing/build.xml
===================================================================
--- /applications/editors/josm/plugins/routing/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/routing/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="3600" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!-- Define some properties -->
Index: /applications/editors/josm/plugins/scripting/build.xml
===================================================================
--- /applications/editors/josm/plugins/scripting/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/scripting/build.xml	(revision 25199)
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Now caches compiled scripts, if possible. Fixes OutOfMemory when running groovy scripts." />
-	<property name="plugin.main.version" value="3751" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!--
Index: /applications/editors/josm/plugins/smed/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/smed/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="some new internationalized messages" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="3514" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/smed_fw/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed_fw/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/smed_fw/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="smed with embeddes felix and DS" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="3514" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="2907" />
+	<property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/terracer/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/terracer/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct" />
-    <property name="plugin.main.version" value="3711" />
+    <property name="plugin.main.version" value="3835" />
 
 
Index: /applications/editors/josm/plugins/turnrestrictions/build.xml
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="Fixing #5614 - JOSM Plugin turn Restrictions" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="3518" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!--
Index: /applications/editors/josm/plugins/undelete/build.xml
===================================================================
--- /applications/editors/josm/plugins/undelete/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/undelete/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="add rudimentary support for undeleting relations" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="2830" />
+	<property name="plugin.main.version" value="3835" />
 
 	<!--
Index: /applications/editors/josm/plugins/videomapping/build.xml
===================================================================
--- /applications/editors/josm/plugins/videomapping/build.xml	(revision 25198)
+++ /applications/editors/josm/plugins/videomapping/build.xml	(revision 25199)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="videomapping" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="1234" />
+	<property name="plugin.main.version" value="3835" />