Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 22849)
+++ /applications/editors/josm/plugins/build.xml	(revision 22850)
@@ -9,4 +9,5 @@
         <mkdir dir="../dist"/>
         <ant antfile="build.xml" target="dist" dir="addrinterpolation"/>
+        <ant antfile="build.xml" target="dist" dir="alignways"/>
         <ant antfile="build.xml" target="dist" dir="buildings_tools"/>
         <ant antfile="build.xml" target="dist" dir="cadastre-fr"/>
@@ -16,5 +17,7 @@
         <ant antfile="build.xml" target="dist" dir="dataimport"/>
         <ant antfile="build.xml" target="dist" dir="DirectUpload"/>
+        <ant antfile="build.xml" target="dist" dir="download_along"/>
         <ant antfile="build.xml" target="dist" dir="editgpx"/>
+        <ant antfile="build.xml" target="dist" dir="ext_tools"/>
         <ant antfile="build.xml" target="dist" dir="globalsat"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
@@ -38,6 +41,8 @@
         <ant antfile="build.xml" target="dist" dir="remotecontrol"/>
         <ant antfile="build.xml" target="dist" dir="reverter"/>
+        <ant antfile="build.xml" target="dist" dir="roadsigns"/>
         <ant antfile="build.xml" target="dist" dir="routes"/>
         <ant antfile="build.xml" target="dist" dir="routing"/>
+        <ant antfile="build.xml" target="dist" dir="simplifyarea"/>
         <ant antfile="build.xml" target="dist" dir="slippymap"/>
         <ant antfile="build.xml" target="dist" dir="surveyor"/>
@@ -45,4 +50,5 @@
         <ant antfile="build.xml" target="dist" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="dist" dir="terracer"/>
+        <ant antfile="build.xml" target="dist" dir="toms"/>
         <ant antfile="build.xml" target="dist" dir="touchscreenhelper"/>
         <ant antfile="build.xml" target="dist" dir="tracer"/>
@@ -53,4 +59,5 @@
         <ant antfile="build.xml" target="dist" dir="walkingpapers"/>
         <ant antfile="build.xml" target="dist" dir="waydownloader"/>
+        <ant antfile="build.xml" target="dist" dir="waypoint_search"/>
         <ant antfile="build.xml" target="dist" dir="wayselector"/>
         <ant antfile="build.xml" target="dist" dir="wmsplugin"/>
@@ -63,4 +70,5 @@
     <target name="clean">
         <ant antfile="build.xml" target="clean" dir="addrinterpolation"/>
+        <ant antfile="build.xml" target="clean" dir="alignways"/>
         <ant antfile="build.xml" target="clean" dir="buildings_tools"/>
         <ant antfile="build.xml" target="clean" dir="cadastre-fr"/>
@@ -70,6 +78,8 @@
         <ant antfile="build.xml" target="clean" dir="dataimport"/>
         <ant antfile="build.xml" target="clean" dir="DirectUpload"/>
+        <ant antfile="build.xml" target="clean" dir="download_along"/>
         <ant antfile="build.xml" target="clean" dir="duplicateway"/>
         <ant antfile="build.xml" target="clean" dir="editgpx"/>
+        <ant antfile="build.xml" target="clean" dir="ext_tools"/>
         <ant antfile="build.xml" target="clean" dir="globalsat"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
@@ -94,6 +104,8 @@
         <ant antfile="build.xml" target="clean" dir="remotecontrol"/>
         <ant antfile="build.xml" target="clean" dir="reverter"/>
+        <ant antfile="build.xml" target="clean" dir="roadsigns"/>
         <ant antfile="build.xml" target="clean" dir="routes"/>
         <ant antfile="build.xml" target="clean" dir="routing"/>
+        <ant antfile="build.xml" target="clean" dir="simplifyarea"/>
         <ant antfile="build.xml" target="clean" dir="slippymap"/>
         <ant antfile="build.xml" target="clean" dir="surveyor"/>
@@ -101,4 +113,5 @@
         <ant antfile="build.xml" target="clean" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="clean" dir="terracer"/>
+        <ant antfile="build.xml" target="clean" dir="toms"/>
         <ant antfile="build.xml" target="clean" dir="touchscreenhelper"/>
         <ant antfile="build.xml" target="clean" dir="tracer"/>
@@ -109,4 +122,5 @@
         <ant antfile="build.xml" target="clean" dir="walkingpapers"/>
         <ant antfile="build.xml" target="clean" dir="waydownloader"/>
+        <ant antfile="build.xml" target="clean" dir="waypoint_search"/>
         <ant antfile="build.xml" target="clean" dir="wayselector"/>
         <ant antfile="build.xml" target="clean" dir="wmsplugin"/>
Index: /applications/editors/josm/plugins/photo_geotagging/build.xml
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 22849)
+++ /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 22850)
@@ -59,5 +59,5 @@
 	<target name="compile" depends="init">
 		<echo message="compiling sources for  ${plugin.jar} ... "/>
-		<javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+		<javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" encoding="iso-8859-1">
 			<compilerarg value="-Xlint:deprecation"/>
 			<compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/videomapping/build.xml
===================================================================
--- /applications/editors/josm/plugins/videomapping/build.xml	(revision 22849)
+++ /applications/editors/josm/plugins/videomapping/build.xml	(revision 22850)
@@ -40,10 +40,10 @@
       ** should not be necessary to change the following properties
      -->
-	<property name="josm"                   location="../JOSM/dist/josm-custom.jar"/> <!-- patched for my own workbench, will fix if I understand how you have to setup it right-->
+	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
 	<property name="plugin.build.dir"       value="build"/>
 	<property name="plugin.src.dir"         value="src"/>
 	<!-- this is the directory where the plugin jar is copied to -->
-	<property name="plugin.dist.dir"        value="../JOSM/dist"/>
-	<property name="ant.build.javac.target" value="1.5"/>
+	<property name="plugin.dist.dir"        value="../../dist"/>
+	<property name="ant.build.javac.target" value="1.6"/>
 	<property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
 	<property name="vlcj"                  value="lib/vlcj-1.1.2.jar"/>
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java	(revision 22849)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java	(revision 22850)
@@ -76,6 +76,5 @@
 		gpsTimeCode= new SimpleDateFormat("hh:mm:ss");
 		Main.map.mapView.addMouseListener(this);
-		Main.map.mapView.addMouseMotionListener(this);							
-		
+		Main.map.mapView.addMouseMotionListener(this);
 	}
 
@@ -96,15 +95,14 @@
 
 	@Override
-	public Component[] getMenuEntries() {
-        return new Component[]{
-                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-                new JSeparator(),
+	public Action[] getMenuEntries() {
+        return new Action[]{
+                LayerListDialog.getInstance().createActivateLayerAction(this),
+                LayerListDialog.getInstance().createShowHideLayerAction(),
+                LayerListDialog.getInstance().createDeleteLayerAction(),
+                SeparatorLayerAction.INSTANCE,
                 //TODO here my stuff
-                new JSeparator(),
-                new JMenuItem(new LayerListPopup.InfoAction(this))};//TODO here infos about the linked videos
-	}
-	  
-
+                SeparatorLayerAction.INSTANCE,
+                new LayerListPopup.InfoAction(this)};//TODO here infos about the linked videos
+	}
 
 	@Override
@@ -123,6 +121,4 @@
 		
 	}
-
-	
 	
 	@Override
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java	(revision 22849)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java	(revision 22850)
@@ -69,5 +69,4 @@
 	  //TODO What more to store during sessions? Size/Position
 	  
-
 	public VideoMappingPlugin(PluginInformation info) {
 		super(info);