Merge branch 'master' into newversion

build.xml

@@ -127,12 +127,14 @@
 		<tstamp>
 			<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
-		<manifest file="MANIFEST.MF">
-			<attribute name="Built-By" value="${user.name}" />
-			<attribute name="Git-Version" value="${gitversion}" />
-			<attribute name="Built-Date" value="${TODAY}" />
-		</manifest>
-		<jar destfile="${dist}/${project.name}-${version}.jar" manifest="MANIFEST.MF" basedir="${build}" />
+		<jar destfile="${dist}/${project.name}-${version}.jar" basedir="${build}" >
+                        <fileset dir="java"/>
+                	<manifest>
+                        	<attribute name="Built-By" value="${user.name}" />
+	                        <attribute name="Git-Version" value="${gitversion}" />
+        	                <attribute name="Built-Date" value="${TODAY}" />
+                	</manifest>
+		</jar>
 	</target>