diff --git a/ivy.xml b/ivy.xml
index 2ded31362..7f3cd2dfd 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -23,7 +23,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 MA 02110-1301  USA
 -->
-<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
+<ivy-module version="2.0" xmlns:m="https://ant.apache.org/ivy/maven">
     <info organisation="org.jaerproject" module="jaer" />
 
     <dependencies>
@@ -64,7 +64,7 @@ MA 02110-1301  USA
             <artifact name="jogl-all" type="jar" ext="jar" m:classifier="natives-windows-amd64"/>
         </dependency>
  
-        
+<!--        <dependency org="javax.xml.bind" name="jaxb-api" rev="2.3.1" />   need for java 14.0-->
         <dependency org="org.swinglabs" name="swing-layout" rev="1.0.3" />
         <dependency org="org.jdesktop" name="beansbinding" rev="1.2.1" />
         
@@ -133,11 +133,11 @@ MA 02110-1301  USA
         <!--tensorflow has native libraries, but handled fine with this dependeny - see https://www.tensorflow.org/install/lang_java -->
         <!--if having trouble loading the DLL, you might have to downgrade locally to version 1.5.0-->
         <!--make sure to delete newer versions of libtensorflow* and tensorflow* from lib/-->
-        <dependency org="org.tensorflow" name="tensorflow" rev="1.12.0" />
+        <dependency org="org.tensorflow" name="tensorflow" rev="1.14.0" />
         
         <!--to use GPU if you have an Nvida GPU installed, comment line above and use lines below with appropriate version of tensor flow. 
         You have to separately install Cuda toolkit  for this to work - see https://developer.nvidia.com/cuda-toolkit -->
-<!--        <dependency org="org.tensorflow" name="libtensorflow_jni_gpu" rev="1.12.0" />-->
+        <dependency org="org.tensorflow" name="libtensorflow_jni_gpu" rev="1.14.0" />
         <!--<dependency org="org.tensorflow" name="libtensorflow" rev="1.12.0" />-->
         
         
diff --git a/jAERViewer_linux.sh b/jAERViewer_linux.sh
index 3fef53306..32f622a5e 100755
--- a/jAERViewer_linux.sh
+++ b/jAERViewer_linux.sh
@@ -13,6 +13,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 java \
 -classpath "$DIR/dist/jAER.jar:$DIR/jars/*:$DIR/lib/*" \
 -splash:images/SplashScreen.gif \
--Dsun.java2d.uiScale=2.5 \
+-Dsun.java2d.uiScale=2.0 \
 -Djava.util.logging.config.file="$DIR/conf/Logging.properties" -Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false \
 net.sf.jaer.JAERViewer "$@"
diff --git a/jAERViewer_linux.xml b/jAERViewer_linux.xml
new file mode 100644
index 000000000..ea4810c1d
--- /dev/null
+++ b/jAERViewer_linux.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="application/jAERViewer_linux.sh">
+        <comment>jAER data file</comment>
+        <glob pattern="*.aedat"/>
+    </mime-type>
+</mime-info>
\ No newline at end of file
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 82e43efed..f79e59f71 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -21,6 +21,7 @@ is divided into following sections:
         -->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="jAER_1.6-impl">
     <import file="jnlp-impl.xml"/>
+    <import file="build-native.xml"/>
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
diff --git a/nbproject/build-native.xml b/nbproject/build-native.xml
new file mode 100644
index 000000000..879cf3728
--- /dev/null
+++ b/nbproject/build-native.xml
@@ -0,0 +1,970 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+*** GENERATED FROM TEMPLATE - DO NOT EDIT ***
+***       EDIT ../build.xml INSTEAD       ***
+-->
+
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+
+Portions Copyrighted 2013 Sun Microsystems, Inc.
+-->
+
+
+<project name="Build Native Packages" default="build-native" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" 
+         xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:fx="javafx:com.sun.javafx.tools.ant">
+    <description>Native Packager Ant calls based on SE support in JavaFX packager</description>
+    
+    <!-- Check system and JDK version -->
+
+    <target name="-check-operating-system">
+        <condition property="running.on.mac">
+            <os family="mac"/>
+        </condition>
+        <condition property="running.on.unix">
+            <os family="unix"/>
+        </condition>
+        <condition property="running.on.windows">
+            <os family="windows"/>
+        </condition>
+        <echo message="running.on.mac = ${running.on.mac}" level="verbose"/>
+        <echo message="running.on.unix = ${running.on.unix}" level="verbose"/>
+        <echo message="running.on.windows = ${running.on.windows}" level="verbose"/>
+     </target>
+
+
+    <!-- Check availability of JavaFX SDK deployment support (ant-javafx.jar) -->
+
+    <target name="-check-endorsed-javafx-ant-classpath">
+        <condition property="endorsed-javafx-ant-classpath-available">
+            <and>
+                <isset property="endorsed.javafx.ant.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.javafx.ant.classpath}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <echo message="endorsed-javafx-ant-classpath-available = ${endorsed-javafx-ant-classpath-available}" level="verbose"/>
+    </target>
+
+    <target name="-check-property-javafx.sdk">
+        <echo message="javafx.sdk = ${javafx.sdk}" level="verbose"/>
+        <condition property="javafx.sdk.defined">
+            <and>
+                <isset property="javafx.sdk"/>
+                <not><contains string="${javafx.sdk}" substring="$${platform" casesensitive="false"/></not>
+            </and>
+        </condition>
+        <condition property="javafx.sdk.missing+default">
+            <and>
+                <equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/>
+                <not><isset property="javafx.sdk.defined"/></not>
+            </and>
+        </condition>
+        <condition property="javafx.sdk.missing-default">
+            <and>
+                <not><equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/></not>
+                <not><isset property="javafx.sdk.defined"/></not>
+            </and>
+        </condition>
+        <echo message="javafx.sdk.defined = ${javafx.sdk.defined}" level="verbose"/>
+        <echo message="javafx.sdk.missing+default = ${javafx.sdk.missing+default}" level="verbose"/>
+        <echo message="javafx.sdk.missing-default = ${javafx.sdk.missing-default}" level="verbose"/>
+    </target>
+
+    <target name="-check-ant-javafx-in-fxsdk-lib" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.ant-javafx.in.fxsdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-fxsdk-lib" depends="-check-ant-javafx-in-fxsdk-lib" if="do.set.ant-javafx.in.fxsdk.lib">
+        <property name="ant-javafx.jar.location" value="${javafx.sdk}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-fxsdk-tools" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.ant-javafx.in.fxsdk.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-fxsdk-tools" depends="-set-ant-javafx-in-fxsdk-lib,-check-ant-javafx-in-fxsdk-tools" if="do.set.ant-javafx.in.fxsdk.tools">
+        <property name="ant-javafx.jar.location" value="${javafx.sdk}${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-platform-home-lib" if="platform.home">
+        <condition property="do.set.ant-javafx.in.platform.home.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${platform.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-platform-home-lib" depends="-set-ant-javafx-in-fxsdk-tools,-check-ant-javafx-in-platform-home-lib" if="do.set.ant-javafx.in.platform.home.lib">
+        <property name="ant-javafx.jar.location" value="${platform.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-platform-home-tools" if="platform.home">
+        <condition property="do.set.ant-javafx.in.platform.home.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-platform-home-tools" depends="-set-ant-javafx-in-platform-home-lib,-check-ant-javafx-in-platform-home-tools" if="do.set.ant-javafx.in.platform.home.tools">
+        <property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.probjdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-probjdk-lib" depends="-set-ant-javafx-in-platform-home-tools,-check-ant-javafx-in-probjdk-lib" if="do.set.ant-javafx.in.probjdk.lib">
+        <property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.probjdk.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-probjdk-tools" depends="-set-ant-javafx-in-probjdk-lib,-check-ant-javafx-in-probjdk-tools" if="do.set.ant-javafx.in.probjdk.tools">
+        <property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.macjdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-macjdk-lib" depends="-set-ant-javafx-in-probjdk-tools,-check-ant-javafx-in-macjdk-lib" if="do.set.ant-javafx.in.macjdk.lib">
+        <property name="ant-javafx.jar.location" value="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-envjdk-lib" unless="ant-javafx.jar.location">
+        <property environment="env"/>
+        <condition property="do.set.ant-javafx.in.envjdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${env.JAVA_HOME}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-envjdk-lib" depends="-set-ant-javafx-in-macjdk-lib,-check-ant-javafx-in-envjdk-lib" if="do.set.ant-javafx.in.envjdk.lib">
+        <property name="ant-javafx.jar.location" value="${env.JAVA_HOME}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-envjdk-tools" unless="ant-javafx.jar.location">
+        <property environment="env"/>
+        <condition property="do.set.ant-javafx.in.envjdk.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${env.JAVA_HOME}${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-envjdk-tools" depends="-set-ant-javafx-in-envjdk-lib,-check-ant-javafx-in-envjdk-tools" if="do.set.ant-javafx.in.envjdk.tools">
+        <property name="ant-javafx.jar.location" value="${env.JAVA_HOME}${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-pre-check-ant-javafx-version" depends="-set-ant-javafx-in-envjdk-tools" unless="ant-javafx-version-already-checked-in-jfximpl">
+        <condition property="do.check.ant-javafx.version">
+            <and>
+                <isset property="ant-javafx.jar.location"/>
+                <not><isset property="ant-javafx-version-already-checked-in-jfximpl"/></not>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-endorsed-javafx-ant-classpath" depends="-check-endorsed-javafx-ant-classpath,-pre-check-ant-javafx-version" if="endorsed-javafx-ant-classpath-available">
+        <property name="javafx.ant.classpath" value="${endorsed.javafx.ant.classpath}:${ant-javafx.jar.location}"/>
+    </target>
+    <target name="-set-javafx-ant-classpath" depends="-check-endorsed-javafx-ant-classpath,-pre-check-ant-javafx-version" unless="endorsed-javafx-ant-classpath-available">
+        <property name="javafx.ant.classpath" value="${ant-javafx.jar.location}"/>
+    </target>
+    
+    <target name="-check-ant-javafx-version" depends="-pre-check-ant-javafx-version,
+            -set-endorsed-javafx-ant-classpath,-set-javafx-ant-classpath" if="do.check.ant-javafx.version">
+        <echo message="ant-javafx.jar.location = ${ant-javafx.jar.location}" level="verbose"/>
+        <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+        <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
+            uri="javafx:com.sun.javafx.tools.ant"
+            classpath="${javafx.ant.classpath}"/>
+        <condition property="have-fx-ant-init">
+            <typefound name="javafx:com.sun.javafx.tools.ant:init-ant"/>
+        </condition>
+        <property name="ant-javafx-version-already-checked-in-jfximpl" value="true"/>
+        <echo message="have-fx-ant-init = ${have-fx-ant-init}" level="verbose"/>
+    </target>
+    <target name="-check-jfx-sdk-version-old" depends="-check-ant-javafx-version" unless="have-fx-ant-init">
+        <property name="javafx.ant.version" value="1.0"/>
+    </target>
+    <target name="-check-jfx-sdk-version-new" depends="-check-ant-javafx-version" if="have-fx-ant-init">
+        <fx:init-ant/>
+        <condition property="have-fx-ant-api-1.1">
+            <!-- new features from JavaFX 2.0.2 are available in API version 1.1 or later -->
+            <matches pattern="1.[1-9]" string="${javafx.ant.version}"/>
+        </condition>
+        <condition property="have-fx-ant-api-1.2">
+            <!-- new features from JavaFX 2.2 are available in API version 1.2 or later -->
+            <matches pattern="1.[2-9]" string="${javafx.ant.version}"/>
+        </condition>
+    </target>
+    
+    <target name="-check-jfx-sdk-version" depends="-check-jfx-sdk-version-old, -check-jfx-sdk-version-new" unless="jfx.sdk.version.checked">
+        <echo message="Detected JavaFX Ant API version ${javafx.ant.version}" level="info"/>
+        <echo message="have-fx-ant-api-1.1 = ${have-fx-ant-api-1.1}" level="verbose"/>
+        <echo message="have-fx-ant-api-1.2 = ${have-fx-ant-api-1.2}" level="verbose"/>
+        <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+        <property name="jfx.sdk.version.checked" value="true"/>
+    </target>
+
+    <target name="-check-ant-jre-version" unless="ant-jre-version-checked-in-jfximpl">
+        <local name="version-output"/>
+        <exec executable="${java.home}${file.separator}bin${file.separator}java" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
+        <echo message="version-output:${line.separator}${version-output}" level="verbose"/>
+        <condition property="have-ant-jre-pre7u6">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+                <contains string="${version-output}" substring="java version &quot;1.4"/>
+                <contains string="${version-output}" substring="java version &quot;1.5"/>
+                <contains string="${version-output}" substring="java version &quot;1.6"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0&quot;"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_01"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_02"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_03"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_04"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_05"/>
+            </or>
+        </condition>
+        <property name="ant-jre-version-checked-in-jfximpl" value="true"/>
+        <echo message="have-ant-jre-pre7u6 = ${have-ant-jre-pre7u6}" level="verbose"/>
+    </target>
+
+        
+    <!-- Native Packaging main target -->    
+    
+    <target name="build-native" depends="-set-do-build-native-package, -check-ant-jre-supports-native-packaging, -check-native-packager-external-tools, -fx-jar-impl, -build-native-impl, -post-build-native-cleanup"/>
+
+    <target name="build-native-noscript">
+        <fail message="Java Application Native Packager requires JDK JavaScript support but has not found any."/>
+    </target>
+
+    <target name="-check-do-jar">
+        <condition property="do-jar-false">
+            <and>
+                <isset property="do.jar"/>
+                <equals arg1="${do.jar}" arg2="false"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="-set-do-build-native-package">
+        <property name="do.build.native.package" value="true"/>
+        <echo message="do.build.native.package = ${do.build.native.package}" level="verbose"/>
+    </target>
+    <target name="-check-ant-jre-supports-native-packaging" depends="-check-jfx-sdk-version, -check-ant-javafx-version, -check-ant-jre-version">
+        <fail message="Error:${line.separator}JavaFX native packager requires NetBeans to run on JDK 1.7u6 or later !" if="have-ant-jre-pre7u6"/>
+    </target>
+    
+    <target name="-check-native-bundling-type" depends="-check-operating-system" if="do.build.native.package">
+        <condition property="need.Inno.presence">
+            <and>
+                <isset property="running.on.windows"/>
+                <isset property="native.bundling.type"/>
+                <or>
+                    <equals arg1="${native.bundling.type}" arg2="all" casesensitive="false"/>
+                    <equals arg1="${native.bundling.type}" arg2="installer" casesensitive="false"/>
+                    <equals arg1="${native.bundling.type}" arg2="exe" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="need.WiX.presence">
+            <and>
+                <isset property="running.on.windows"/>
+                <isset property="native.bundling.type"/>
+                <or>
+                    <equals arg1="${native.bundling.type}" arg2="all" casesensitive="false"/>
+                    <equals arg1="${native.bundling.type}" arg2="installer" casesensitive="false"/>
+                    <equals arg1="${native.bundling.type}" arg2="msi" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="need.dpkg.presence">
+            <and>
+                <isset property="running.on.unix"/>
+                <isset property="native.bundling.type"/>
+                <or>
+                    <equals arg1="${native.bundling.type}" arg2="deb" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="need.rpmbuild.presence">
+            <and>
+                <isset property="running.on.unix"/>
+                <isset property="native.bundling.type"/>
+                <or>
+                    <equals arg1="${native.bundling.type}" arg2="rpm" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <echo message="need.Inno.presence:${need.Inno.presence}" level="verbose"/>
+        <echo message="need.WiX.presence:${need.WiX.presence}" level="verbose"/>
+        <echo message="need.dpkg.presence:${need.dpkg.presence}" level="verbose"/>
+        <echo message="need.rpmbuild.presence:${need.rpmbuild.presence}" level="verbose"/>
+    </target>
+    <target name="-check-Inno-presence" depends="-check-native-bundling-type" if="need.Inno.presence">
+        <local name="exec-output"/>
+        <local name="exec-error"/>
+        <local name="exec-result"/>
+        <exec executable="iscc" outputproperty="exec-output" failifexecutionfails="false" errorproperty="exec-error" resultproperty="exec-result"/>
+        <echo message="exec-output:${exec-output}" level="verbose"/>
+        <echo message="exec-error:${exec-error}" level="verbose"/>
+        <echo message="exec-result:${exec-result}" level="verbose"/>
+        <condition property="missing.Inno">
+            <not><and>
+                <contains string="${exec-output}" substring="Inno Setup"/>
+                <not><contains string="${exec-output}" substring="Inno Setup 1"/></not>
+                <not><contains string="${exec-output}" substring="Inno Setup 2"/></not>
+                <not><contains string="${exec-output}" substring="Inno Setup 3"/></not>
+                <not><contains string="${exec-output}" substring="Inno Setup 4"/></not>
+            </and></not>
+        </condition>
+    </target>
+    <target name="-check-WiX-presence" depends="-check-native-bundling-type" if="need.WiX.presence">
+        <local name="exec-output"/>
+        <local name="exec-error"/>
+        <local name="exec-result"/>
+        <exec executable="candle" outputproperty="exec-output" failifexecutionfails="false" errorproperty="exec-error" resultproperty="exec-result">
+            <arg value="-?"/>
+        </exec>
+        <echo message="exec-output:${exec-output}" level="verbose"/>
+        <echo message="exec-error:${exec-error}" level="verbose"/>
+        <echo message="exec-result:${exec-result}" level="verbose"/>
+        <condition property="missing.WiX">
+            <not>
+                <matches string="${exec-output}" pattern="windows\s+installer\s+xml\s+(toolset\s+)?compiler\s+version\s+3.*" casesensitive="false"/>
+            </not>
+        </condition>
+    </target>
+    <target name="-check-dpkg-presence" depends="-check-native-bundling-type" if="need.dpkg.presence">
+        <local name="exec.which.dpkg.result"/>
+        <local name="exec.which.dpkg.output"/>
+        <exec executable="command" failifexecutionfails="false" failonerror="false" resultproperty="exec.which.dpkg.result" outputproperty="exec.which.dpkg.output">
+            <arg line="-v dpkg"/>
+        </exec>
+        <condition property="missing.dpkg">
+            <not><and>
+                <isset property="exec.which.dpkg.result"/>
+                <equals arg1="${exec.which.dpkg.result}" arg2="0"/>
+                <isset property="exec.which.dpkg.output"/>
+                <not><equals arg1="${exec.which.dpkg.output}" arg2=""/></not>
+            </and></not>
+        </condition>
+    </target>
+    <target name="-check-rpmbuild-presence" depends="-check-native-bundling-type" if="need.rpmbuild.presence">
+        <local name="exec.which.rpmbuild.result"/>
+        <local name="exec.which.rpmbuild.output"/>
+        <exec executable="command" failifexecutionfails="false" failonerror="false" resultproperty="exec.which.rpmbuild.result" outputproperty="exec.which.rpmbuild.output">
+            <arg line="-v rpmbuild"/>
+        </exec>
+        <condition property="missing.rpmbuild">
+            <not><and>
+                <isset property="exec.which.rpmbuild.result"/>
+                <equals arg1="${exec.which.rpmbuild.result}" arg2="0"/>
+                <isset property="exec.which.rpmbuild.output"/>
+                <not><equals arg1="${exec.which.rpmbuild.output}" arg2=""/></not>
+            </and></not>
+        </condition>
+    </target>
+    <target name="-check-native-packager-external-tools" depends="-check-Inno-presence, -check-WiX-presence, -check-dpkg-presence, -check-rpmbuild-presence">
+        <property name="missing.Inno.message" value="JavaFX native packager requires external Inno Setup 5+ tools installed and included on PATH to create EXE installer. See http://www.jrsoftware.org/"/>
+        <property name="missing.WiX.message" value="JavaFX native packager requires external WiX 3.0+ tools installed and included on PATH to create MSI installer. See http://wix.sourceforge.net/"/>
+        <property name="missing.dpkg.message" value="JavaFX native packager requires Debian Packager tools to create DEB package, but dpkg could not be found."/>
+        <property name="missing.rpmbuild.message" value="JavaFX native packager requires RPMBuild to create RPM package, but rpmbuild could not be found."/>
+        <condition property="missing.Inno.WiX">
+            <and>
+                <isset property="missing.Inno"/>
+                <isset property="missing.WiX"/>
+            </and>
+        </condition>
+        <fail message="Error:${line.separator}${missing.Inno.message}${line.separator}${missing.WiX.message}" if="missing.Inno.WiX"/>
+        <fail message="Error:${line.separator}${missing.Inno.message}" if="missing.Inno"/>
+        <fail message="Error:${line.separator}${missing.WiX.message}" if="missing.WiX"/>
+        <fail message="Error:${line.separator}${missing.dpkg.message}" if="missing.dpkg"/>
+        <fail message="Error:${line.separator}${missing.rpmbuild.message}" if="missing.rpmbuild"/>
+    </target>
+
+
+    <!-- Copy dependent libraries -->
+
+    <target name="-jfx-copylibs" depends="init,compile,-pre-pre-jar,-pre-jar,-jfx-copylibs-warning" unless="fallback.no.javascript">
+        <jfx-copylibs-js-impl/>
+    </target>
+    <target name="-jfx-copylibs-warning" if="fallback.no.javascript">
+        <echo message="Warning: Dependent Libraries copy (-jfx-copylibs) skipped in fallback build mode due to JDK missing JavaScript support."/>
+    </target>
+    <macrodef name="jfx-copylibs-js-impl">
+        <sequential>
+            <local name="run.classpath.without.build.classes.and.dist.dir"/>
+            <pathconvert property="run.classpath.without.build.classes.and.dist.dir">
+                <path path="${run.classpath}"/>
+                <map from="${basedir}${file.separator}${build.classes.dir}" to=""/>
+                <map from="${basedir}${file.separator}${dist.jar}" to=""/>
+                <scriptmapper language="javascript">
+                    self.addMappedName(
+                        (source.indexOf("jfxrt.jar") >= 0) ||
+                        (source.indexOf("deploy.jar") >= 0) ||
+                        (source.indexOf("javaws.jar") >= 0) ||
+                        (source.indexOf("plugin.jar") >= 0)
+                        ? "" : source
+                    );
+                </scriptmapper>
+            </pathconvert>
+            <!-- add possibly missing dependencies at distance 2 (build system logic thus provides transitive closure) -->
+            <local name="run.and.lib.classpath"/>
+            <echo message="JavaScript: -jfx-copylibs" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    function prefix(s, len) {
+                        if(s == null || len <= 0 || s.length == 0) {
+                            return new String("");
+                        }
+                        return new String(s.substr(0, len));
+                    }
+                    function defined(s) {
+                        return (s != null) && (s != "null") && (s.length > 0);
+                    }
+                    var classPath = new String(project.getProperty("run.classpath.without.build.classes.and.dist.dir"));
+                    if(defined(classPath)) {
+                        var fileSeparator = new String(project.getProperty("file.separator"));
+                        var pathConvert = project.createTask("pathconvert");
+                        pathConvert.setProperty("run.and.lib.classpath");
+                        var classPathCopy = pathConvert.createPath();
+                        classPathCopy.setPath(classPath);
+                        var pathArray;
+                        if(classPath.indexOf(";") != -1) {
+                            pathArray = classPath.split(";");
+                        } else {
+                            pathArray = classPath.split(":");
+                        }
+                        var added = new java.lang.StringBuilder();
+                        for (var i = 0; i < pathArray.length; i++) {
+                            var index = pathArray[i].lastIndexOf(fileSeparator);
+                            if (index >= 0) {
+                                var onePath = prefix(pathArray[i], index+1).concat("lib");
+                                var oneDir = new java.io.File(onePath);
+                                if(oneDir.exists()) {
+                                    var fs = project.createDataType( "fileset" );
+                                    fs.setDir( oneDir );
+                                    fs.setIncludes("*.jar");
+                                    var ds = fs.getDirectoryScanner(project);
+                                    var srcFiles = ds.getIncludedFiles();
+                                    for (var j = 0; j < srcFiles.length; j++) {
+                                        if(classPath.indexOf( srcFiles[j] ) == -1 && added.indexOf( srcFiles[j] ) == -1) {
+                                            var path = pathConvert.createPath();
+                                            path.setPath( onePath.concat(fileSeparator).concat(srcFiles[j]) );
+                                            added.append( srcFiles[j] );
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        pathConvert.perform();
+                    }
+                ]]>
+            </script>
+            <echo message="run.and.lib.classpath = ${run.and.lib.classpath}" level="verbose"/>
+            <property name="run.and.lib.classpath" value=""/> <!-- fallback -->
+            <delete dir="${dist.dir}${file.separator}lib" includeEmptyDirs="true" quiet="true"/>
+            <copy todir="${dist.dir}${file.separator}lib" flatten="true" preservelastmodified="true" overwrite="true">
+                <path>
+                    <pathelement path="${run.and.lib.classpath}"/>
+                </path>
+            </copy>
+        </sequential>
+    </macrodef>
+
+
+    <!-- <fx:jar> replacing standard jar, because native packager up to JDK7u21 refuses to package standard jars -->
+
+    <target name="-fx-jar-impl" depends="-check-jfx-sdk-version, -check-ant-javafx-version, -check-ant-jre-version, clean, compile, -jfx-copylibs">
+        <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+        <typedef name="fx_jar" classname="com.sun.javafx.tools.ant.FXJar" classpath="${javafx.ant.classpath}"/>
+        <echo message="Launching &lt;fx:jar&gt; task from ${ant-javafx.jar.location}" level="info"/>
+        <property name="deployment.dir" location="${dist.dir}"/>
+        <basename property="deployment.jar" file="${dist.jar}"/>
+        <property name="pp_jar_destfile" value="${deployment.dir}${file.separator}${deployment.jar}"/>
+        <property name="pp_jar_buildclasses" value="${basedir}${file.separator}${build.classes.dir}"/>
+        <property name="pp_jar_dir" value="${deployment.dir}"/>
+        <property name="pp_jar_fs2" value="lib${file.separator}*.jar"/>
+        <echo message="fx_jar: pp_jar_destfile = ${pp_jar_destfile}" level="verbose"/>
+        <echo message="fx_jar: pp_jar_buildclasses = ${pp_jar_buildclasses}" level="verbose"/>
+        <echo message="fx_jar: pp_jar_dir = ${pp_jar_dir}" level="verbose"/>
+        <echo message="fx_jar: pp_jar_fs2 = ${pp_jar_fs2}" level="verbose"/>
+        <echo message="JavaScript: fx-jar" level="verbose"/>
+        <script language="javascript">
+            <![CDATA[
+                function isTrue(prop) {
+                    return prop != null &&
+                       ( prop.toLowerCase() == "true" || prop.toLowerCase() == "yes" || prop.toLowerCase() == "on" );
+                }
+                function prefix(s, len) {
+                    if(s == null || len <= 0 || s.length == 0) {
+                        return new String("");
+                    }
+                    return new String(s.substr(0, len));
+                }
+                function replaceSuffix(s, os, ns) {
+                    return prefix(s, s.indexOf(os)).concat(ns);
+                }
+                function startsWith(s, prefix) {
+                    return (s != null) && (s.indexOf(prefix) == 0);
+                }
+                function endsWith(s, suffix) {
+                    var i = s.lastIndexOf(suffix);
+                    return  (i != -1) && (i == (s.length - suffix.length));
+                }
+                function defined(s) {
+                    return (s != null) && (s != "null") && (s.length > 0);
+                }
+                function contains(array, prop) {
+                    for (var i = 0; i < array.length; i++) {
+                        var s1 = new String(array[i]);
+                        var s2 = new String(prop);
+                        if( s1.toLowerCase() == s2.toLowerCase() ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+                var S = new String(java.io.File.separator);
+                var JFXLAZY = "download.mode.lazy.jar";
+                var fx_ant_api_1_1 = new String(project.getProperty("have-fx-ant-api-1.1"));
+                var fx_ant_api_1_2 = new String(project.getProperty("have-fx-ant-api-1.2"));
+
+                // get jars with lazy download mode property set
+                function getLazyJars() {
+                    var jars = new Array();
+                    var keys = project.getProperties().keys();
+                    while(keys.hasMoreElements()) {
+                        var pn = new String(keys.nextElement());
+                        if(startsWith(pn, JFXLAZY)) {
+                            var fname = new String(pn.substring(JFXLAZY.length+1));
+                            jars.push(fname);
+                        }
+                    }
+                    return jars.length > 0 ? jars : null;
+                }
+                // set download mode of dependent libraries
+                function setDownloadMode(fsEager, fsLazy, jars) {
+                    for(var i = 0; i < jars.length; i++) {
+                        fsEager.setExcludes("lib" + S + jars[i]);
+                        fsLazy.setIncludes("lib" + S + jars[i]);
+                    }
+                }
+
+                // fx:jar
+                var jar = project.createTask("fx_jar");
+                jar.setProject(project);
+                var destfile = new String(project.getProperty("pp_jar_destfile"));
+                jar.setDestfile(destfile);
+
+                // fx:application
+                var app = jar.createApplication();
+                app.setProject(project);
+                var title = new String(project.getProperty("application.title"));
+                var mainclass;
+                mainclass = new String(project.getProperty("main.class"));
+                if(isTrue(fx_ant_api_1_2)) {
+                    app.setToolkit("swing");
+                }
+                app.setName(title);
+                app.setMainClass(mainclass);
+                var appversion = new String(project.getProperty("application.implementation.version"));
+                if(defined(appversion)) {
+                    app.setVersion(appversion);
+                } else {
+                    app.setVersion("1.0");
+                }
+
+                // fx:resources
+                var res = jar.createResources();
+                res.setProject(project);
+                var pdir = new String(project.getProperty("pp_jar_dir"));
+                var fn = res.createFileSet();
+                fn.setProject(project);
+                fn.setDir(new java.io.File(pdir));
+                var ia = new String(project.getProperty("deployment.jar"));
+                var ib = new String(project.getProperty("pp_jar_fs2"));
+                fn.setIncludes(ia);
+                fn.setIncludes(ib);
+                fn.setRequiredFor("startup");
+                var lazyjars = getLazyJars();
+                if(lazyjars != null) {
+                    var fn2 = res.createFileSet();
+                    fn2.setProject(project);
+                    fn2.setDir(new java.io.File(pdir));
+                    fn2.setRequiredFor("runtime");
+                    setDownloadMode(fn,fn2,lazyjars);
+                }
+
+                // fileset to include classes
+                var fs = jar.createFileSet();
+                fs.setProject(project);
+                var buildcls = new String(project.getProperty("pp_jar_buildclasses"));
+                fs.setDir(new java.io.File(buildcls));
+
+                // manifest
+                var man = jar.createManifest();
+                var userManifestPath = project.getProperty("manifest.file");
+                if (userManifestPath) {
+                    var userManifestFile = project.resolveFile(userManifestPath);
+                    if (userManifestFile.isFile()) {
+                        var manifestEncoding = project.getProperty("manifest.encoding");
+                        var userManifestReader = manifestEncoding ?
+                                new java.io.InputStreamReader(
+                                    new java.io.FileInputStream(userManifestFile),
+                                    manifestEncoding) :
+                                new java.io.InputStreamReader(
+                                    new java.io.FileInputStream(userManifestFile));
+                        try {
+                            var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
+                            man.merge(userManifest);
+                        } finally {
+                            userManifestReader.close();
+                        }
+                    }
+                }
+                var a1val = new String(project.getProperty("application.vendor"));
+                var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                a1.setName("Implementation-Vendor");
+                a1.setValue(a1val);
+                man.addConfiguredAttribute(a1);
+                var a2val = new String(project.getProperty("application.title"));
+                var a2 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                a2.setName("Implementation-Title");
+                a2.setValue(a2val);
+                man.addConfiguredAttribute(a2);
+                if(defined(appversion)) {
+                    var a3 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                    a3.setName("Implementation-Version");
+                    a3.setValue(appversion);
+                    man.addConfiguredAttribute(a3);
+                }
+                var profileAvailable = new String(project.getProperty("profile.available"));
+                if (defined(profileAvailable)) {
+                    var profileAttribute = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                    profileAttribute.setName("Profile");
+                    profileAttribute.setValue(new String(project.getProperty("javac.profile")));
+                    man.addConfiguredAttribute(profileAttribute);
+                }
+                var splashScreenAvailable = new String(project.getProperty("splashscreen.available"));
+                if (defined(splashScreenAvailable)) {
+                    project.setProperty("deploy.splash.image",new String(project.getProperty("application.splash")));
+                }
+                jar.perform();
+            ]]>
+        </script>
+    </target>
+
+    
+    <!-- Native Packaging main implementation -->    
+    
+    <target name="-build-native-impl" depends="-check-ant-jre-supports-native-packaging, -check-native-packager-external-tools, -fx-jar-impl">
+
+        <!--<property name="runtime.jre.home" value="${platform.home}"/>-->
+        <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+        <typedef name="fx_deploy" classname="com.sun.javafx.tools.ant.DeployFXTask" classpath="${javafx.ant.classpath}"/>
+        <echo message="Launching &lt;fx:deploy&gt; task from ${ant-javafx.jar.location}" level="info"/>
+        <property name="deployment.dir" location="${dist.dir}"/>
+        <property name="pp_deploy_fs2" value="lib${file.separator}*.jar"/>
+        <basename property="deployment.jar" file="${dist.jar}"/>
+        <basename property="deployment.base" file="${deployment.jar}" suffix=".jar"/>
+        <echo message="deploy_deploy: pp_deploy_fs2 = ${pp_deploy_fs2}" level="verbose"/>
+        <echo message="deploy_deploy: deployment.dir = ${deployment.dir}" level="verbose"/>
+        <echo message="deploy_deploy: deployment.jar = ${deployment.jar}" level="verbose"/>
+        <echo message="deploy_deploy: deployment.base = ${deployment.base}" level="verbose"/>
+        <echo message="JavaScript: deploy-deploy" level="verbose"/>
+        <script language="javascript">
+            <![CDATA[
+                function isTrue(prop) {
+                    return prop != null && 
+                       (prop.toLowerCase()=="true" || prop.toLowerCase()=="yes" || prop.toLowerCase()=="on");
+                }                    
+                function prefix(s, len) {
+                    if(s == null || len <= 0 || s.length == 0) {
+                        return new String("");
+                    }
+                    return new String(s.substr(0, len));
+                }
+                function replaceSuffix(s, os, ns) {
+                    return prefix(s, s.indexOf(os)).concat(ns);
+                }
+                function startsWith(s, prefix) {
+                    return (s != null) && (s.indexOf(prefix) == 0);
+                }
+                function endsWith(s, suffix) {
+                    var i = s.lastIndexOf(suffix);
+                    return  (i != -1) && (i == (s.length - suffix.length));
+                }
+                function defined(s) {
+                    return (s != null) && (s != "null") && (s.length > 0);
+                }
+                function contains(array, prop) {
+                    for (var i = 0; i < array.length; i++) {
+                        var s1 = new String(array[i]);
+                        var s2 = new String(prop);
+                        if( s1.toLowerCase() == s2.toLowerCase() ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+                var S = java.io.File.separator;
+                var JFXLAZY = "download.mode.lazy.jar";
+                var fx_ant_api_1_1 = new String(project.getProperty("have-fx-ant-api-1.1"));
+                var fx_ant_api_1_2 = new String(project.getProperty("have-fx-ant-api-1.2"));
+                var have_jdk_pre7u14 = new String(project.getProperty("have-jdk-pre7u14"));
+
+                // get jars with lazy download mode property set
+                function getLazyJars() {
+                    var jars = new Array();
+                    var keys = project.getProperties().keys();
+                    while(keys.hasMoreElements()) {
+                        var pn = new String(keys.nextElement());
+                        if(startsWith(pn, JFXLAZY)) {
+                            var fname = pn.substring(JFXLAZY.length+1);
+                            jars.push(fname);
+                        }
+                    }
+                    return jars.length > 0 ? jars : null;
+                }
+                // set download mode of dependent libraries
+                function setDownloadMode(fsEager, fsLazy, jars) {
+                    for(var i = 0; i < jars.length; i++) {
+                        fsEager.setExcludes("lib" + S + jars[i]);
+                        fsLazy.setIncludes("lib" + S + jars[i]);
+                    }
+                }
+                // convert path to absolute if relative
+                function derelativizePath(path) {
+                    var f = new java.io.File(path);
+                    if(!f.exists()) {
+                        f = new java.io.File(new String(project.getBaseDir()) + S + path);
+                    }
+                    if(f.exists()) {
+                        try {
+                            return f.getCanonicalPath();
+                        } catch(err) {
+                            return path;
+                        }
+                    }
+                    return path;
+                }
+
+                // fx:deploy
+                var deploy = project.createTask("fx_deploy");
+                deploy.setProject(project);
+                var width = new String(project.getProperty("javafx.width"));
+                var height = new String(project.getProperty("javafx.height"));
+                var outdir = new String(project.getProperty("deployment.dir"));
+                var outfile = new String(project.getProperty("application.title"));
+                if(!defined(width)) width=new String("0");
+                if(!defined(height)) height=new String("0");
+                deploy.setWidth(width);
+                deploy.setHeight(height);
+                deploy.setOutdir(outdir);
+                deploy.setOutfile(outfile);
+
+                // native packaging (time consuming, thus applied in explicit build only)
+                var nativeEnabled = new String(project.getProperty("do.build.native.package"));
+                var nativeType = new String(project.getProperty("native.bundling.type"));
+                var projStateRun = new String(project.getProperty("project.state.running"));
+                var projStateDbg = new String(project.getProperty("project.state.debugging"));
+                var projStatePrf = new String(project.getProperty("project.state.profiling"));
+                if(isTrue(nativeEnabled) && defined(nativeType) && nativeType != "none") {
+                    if(!isTrue(projStateRun) && !isTrue(projStateDbg) && !isTrue(projStatePrf)) {
+                        if(isTrue(fx_ant_api_1_2)) {
+                            deploy.setNativeBundles(nativeType);
+                            print("Note: To create native bundles the <fx:deploy> task may require external tools. See JavaFX 2.2+ documentation for details.");
+                            print("");
+                            print("Launching <fx:deploy> in native packager mode...");
+                        } else {
+                            print("Warning: Native packaging is not supported by this version of JavaFX SDK deployment Ant task. Please upgrade to JDK 7u6 or higher.");
+                        }
+                    }
+                }
+
+                // fx:application
+                var app = deploy.createApplication();
+                app.setProject(project);
+                var title = new String(project.getProperty("application.title"));
+                var mainclass;
+                mainclass = new String(project.getProperty("main.class"));
+                if(isTrue(fx_ant_api_1_2)) {
+                    app.setToolkit("swing");
+                }
+                app.setName(title);
+                app.setMainClass(mainclass);
+                var appversion = new String(project.getProperty("application.implementation.version"));
+                if(defined(appversion)) {
+                    app.setVersion(appversion);
+                } else {
+                    app.setVersion("1.0");
+                }
+
+                // fx:resources
+                var res = deploy.createResources();
+                res.setProject(project);
+                var deploydir = new String(project.getProperty("deployment.dir"));
+                var fn = res.createFileSet();
+                fn.setProject(project);
+                fn.setDir(new java.io.File(deploydir));
+                var ia = new String(project.getProperty("deployment.jar"));
+                var ib = new String(project.getProperty("pp_deploy_fs2"));
+                fn.setIncludes(ia);
+                fn.setIncludes(ib);
+                fn.setRequiredFor("startup");
+                var lazyjars = getLazyJars();
+                if(lazyjars != null) {
+                    var fn2 = res.createFileSet();
+                    fn2.setProject(project);
+                    fn2.setDir(new java.io.File(deploydir));
+                    fn2.setRequiredFor("runtime");
+                    setDownloadMode(fn,fn2,lazyjars);
+                }
+
+                // fx:info
+                var info = deploy.createInfo();
+                info.setProject(project);
+                var vendor = new String(project.getProperty("application.vendor"));
+                var description = new String(project.getProperty("application.desc"));
+                info.setTitle(title); // title known from before
+                info.setVendor(vendor);
+                info.setDescription(description);
+                var splash = new String(project.getProperty("deploy.splash.image"));
+                if(defined(splash)) {
+                    if(isTrue(fx_ant_api_1_1)) {
+                        var sicon = info.createSplash();
+                        sicon.setHref(splash);
+                        sicon.setMode("any");
+                        print("Adding splash image reference: " + splash);
+                    } else {
+                        print("Warning: Splash Image not supported by this version of JavaFX SDK deployment Ant task. Please upgrade JavaFX to 2.0.2 or higher.");
+                    }
+                }
+                if(isTrue(nativeEnabled) && defined(nativeType) && nativeType != "none") {
+                    var icon = new String(project.getProperty("deploy.icon.native"));
+                    if(defined(icon)) {
+                        if(isTrue(fx_ant_api_1_2) && !isTrue(have_jdk_pre7u14)) {
+                            var dicon = derelativizePath(icon);
+                            // create temporary icon copy renamed to application name (required by native packager)
+                            var baseDir = new String(project.getProperty("basedir"));
+                            var buildDir = new String(project.getProperty("build.dir"));
+                            var deployBase = new String(project.getProperty("deployment.base"));
+                            var copyTask = project.createTask("copy");
+                            var source = new java.io.File(dicon);
+                            var sourceName = new String(source.getName());
+                            var lastDot = sourceName.lastIndexOf(".");
+                            var sourceExt;
+                            if(lastDot >=0) {
+                                sourceExt = sourceName.substr(lastDot);
+                            } else {
+                                sourceExt = new String("");
+                            }
+                            var target = new java.io.File(baseDir.concat(S).concat(buildDir).concat(S).concat("icon").concat(S).concat(deployBase).concat(sourceExt));
+                            copyTask.setFile(source);
+                            copyTask.setTofile(target);
+                            copyTask.setFlatten(true);
+                            copyTask.setFailOnError(false);
+                            copyTask.perform();
+                            var tempicon;
+                            if(target.exists()) {
+                                try {
+                                    tempicon = target.getCanonicalPath();
+                                } catch(err) {
+                                    tempicon = dicon;
+                                }
+                            } else {
+                                tempicon = dicon;
+                            }
+                            var nicon = info.createIcon();
+                            nicon.setHref(tempicon);
+                            print("Source native icon reference: " + dicon);
+                            print("Processed native icon reference: " + tempicon);
+                        } else {
+                            print("Warning: Native Package icon not supported by this version of JavaFX SDK deployment Ant task. Please upgrade to JDK7u14.");
+                        }
+                    }
+                } else {
+                    var icon = new String(project.getProperty("deploy.icon.webstart"));
+                    if(defined(icon)) {
+                        if(isTrue(fx_ant_api_1_1)) {
+                            var iicon = info.createIcon();
+                            iicon.setHref(icon);
+                            print("Adding WebStart icon reference: " + icon);
+                        } else {
+                            print("Warning: WebStart Icon not supported by this version of JavaFX SDK deployment Ant task. Please upgrade JavaFX to 2.0.2 or higher.");
+                        }
+                    }
+                }
+
+                deploy.perform();
+            ]]>
+        </script>
+    </target>
+    
+    <target name="-post-build-native-cleanup">
+        <delete file="${dist.dir}/${application.title}.html" quiet="true"/>
+        <delete file="${dist.dir}/${application.title}.jnlp" quiet="true"/>
+        <delete file="${dist.dir}/${application.title}_browser.jnlp" quiet="true"/>
+    </target>
+</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 2fbd9009f..66e320953 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e3657c9d
-nbproject/build-impl.xml.script.CRC32=5c04f767
+nbproject/build-impl.xml.data.CRC32=76fdb190
+nbproject/build-impl.xml.script.CRC32=7cac21e4
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1e3f5afa7..7fe28ba7b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,127 +1,128 @@
-#Sun, 08 Mar 2020 16:27:04 +0100
-annotation.processing.enabled=false
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-ant.customtasks.libs=JWSAntTasks
-application.desc=Real-time event-based processing using neuromorphic AER sensors
-application.homepage=http\://jaerproject.net
-application.splash=src\\net\\sf\\jaer\\images\\SplashScreen.gif
-application.title=jAER
-application.vendor=Inst. of Neuroinformatics, Univesity of Zurich and ETH Zurich
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.eclipseFormatterActiveProfile=
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.eclipseFormatterEnabled=false
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.eclipseFormatterLocation=
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.enableFormatAsSaveAction=false
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.linefeed=
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.preserveBreakPoints=true
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.SaveActionModifiedLinesOnly=false
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.showNotifications=true
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.sourcelevel=
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.useProjectPref=true
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.useProjectSettings=false
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-debug.modulepath=${run.modulepath}
-debug.test.modulepath=${run.test.modulepath}
-endorsed.classpath=
-excludes=uk/ac/imperial/
-file.reference.=../../../../../..
-file.reference.ant.jar=jars/ant.jar
-file.reference.jogl-1_0_0-windows-i586.zip=jars/jogl-1_0_0-windows-i586.zip
-file.reference.message_generation-0.3.0.jar=jars/message_generation-0.3.0.jar
-file.reference.org.openni.jar=jars\\openni2\\org.openni.jar
-file.reference.rosjava-0.3.5.jar=jars/rosjava-0.3.5.jar
-file.reference.RXTXcomm.jar-1=jars/RXTXcomm.jar
-file.reference.UsbIoJava.jar-1=jars/UsbIoJava.jar
-file.reference.USBTransferThread-0.9.6.jar=jars/USBTransferThread-0.9.6.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.index=${jnlp.enabled}
-javac.external.vm=false
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=${javac.classpath}
-javac.test.modulepath=${javac.modulepath}
-javadoc.additionalparam=-J-Xmx512m -header "<a href\="http\://jaer.wiki.sourceforge.net">jAER project on SourceForge</a> - ${DSTAMP}" -overview "${basedir}/${src.dir}/overview.html"
-application.args=
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form,**/doc-files/**,**/package.html
-# This directory is removed when the project is cleaned:
-build.dir=build
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=${run.classpath}
-debug.test.classpath=${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/jAER.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.java-src=src
-jar.compress=true
-javac.classpath=${file.reference.USBTransferThread-0.9.6.jar}\:${file.reference.UsbIoJava.jar-1}\:${file.reference.ant.jar}\:${file.reference.org.openni.jar}\:${file.reference.rosjava-0.3.5.jar}\:${file.reference.message_generation-0.3.0.jar}\:${ivy.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=true
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=${javac.classpath}\:${build.classes.dir}
-javadoc.author=true
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=true
-javadoc.windowtitle=jAER javadoc
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jnlp.applet.class=net.sf.jaer.jaerappletviewer.ClockApplet
-jnlp.applet.height=300
-jnlp.applet.width=300
-jnlp.codebase.type=local
-jnlp.codebase.url=file\:/C\:/Documents%20and%20Settings/tobi/My%20Documents/~jAER-sourceForge/trunk/host/java/dist/
-jnlp.descriptor=component
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=net.sf.jaer.JAERViewer
-# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
-manifest.custom.application.library.allowable.codebase=
-# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
-manifest.custom.caller.allowable.codebase=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.jSpikeStack=subprojects/JSpikeStack
-project.license=lgpl21
-run.classpath=${javac.classpath}\:${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-Djava.library.path\=jars -Djava.util.logging.config.file\=conf/Logging.properties  -Dsun.java2d.noddraw\=true  -Dsun.java2d.opengl\=false -Djogl.disable.opengles\=false -splash\:SplashScreen.gif
-run.modulepath=${javac.modulepath}
-run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
-run.test.modulepath=${javac.test.modulepath}
-source.encoding=UTF-8
-src.dir=${file.reference.java-src}
-test.src.dir=test
-
-#filename of svn version
-buildversion.outputfile=${build.dir}/classes/BUILDVERSION.txt
-
-
-ivy.classpath=lib/annotations-1.0.0.jar\:lib/artoolkitplus-2.3.1-1.0.jar\:lib/bag-reader-java-1.10.0-javadoc.jar\:lib/bag-reader-java-1.10.0-sources.jar\:lib/bag-reader-java-1.10.0.jar\:lib/beansbinding-1.2.1.jar\:lib/commons-codec-1.10.jar\:lib/commons-compress-1.10.jar\:lib/commons-io-2.4.jar\:lib/commons-lang3-3.7-javadoc.jar\:lib/commons-lang3-3.7-sources.jar\:lib/commons-lang3-3.7.jar\:lib/commons-math3-3.6.1-javadoc.jar\:lib/commons-math3-3.6.1-sources.jar\:lib/commons-math3-3.6.1.jar\:lib/commons-net-3.6-javadoc.jar\:lib/commons-net-3.6-sources.jar\:lib/commons-net-3.6.jar\:lib/commons-pool2-2.4.2.jar\:lib/ffmpeg-2.7.1-1.0.jar\:lib/flandmark-1.07-1.0.jar\:lib/flycapture-2.7.3.19-1.0.jar\:lib/gluegen-rt-2.3.2-natives-linux-amd64.jar\:lib/gluegen-rt-2.3.2-natives-linux-i586.jar\:lib/gluegen-rt-2.3.2-natives-macosx-universal.jar\:lib/gluegen-rt-2.3.2-natives-solaris-amd64.jar\:lib/gluegen-rt-2.3.2-natives-solaris-i586.jar\:lib/gluegen-rt-2.3.2-natives-windows-amd64.jar\:lib/gluegen-rt-2.3.2-natives-windows-i586.jar\:lib/gluegen-rt-2.3.2.jar\:lib/gluegen-rt-main-2.3.2-javadoc.jar\:lib/gluegen-rt-main-2.3.2-sources.jar\:lib/gluegen-rt-main-2.3.2.jar\:lib/gson-2.8.2-javadoc.jar\:lib/gson-2.8.2-sources.jar\:lib/gson-2.8.2.jar\:lib/guava-18.0-javadoc.jar\:lib/guava-18.0-sources.jar\:lib/guava-18.0.jar\:lib/hamcrest-core-1.3.jar\:lib/hdf5-1.10.1-1.4-linux-x86.jar\:lib/hdf5-1.10.1-1.4-linux-x86_64.jar\:lib/hdf5-1.10.1-1.4-macosx-x86_64.jar\:lib/hdf5-1.10.1-1.4-windows-x86.jar\:lib/hdf5-1.10.1-1.4-windows-x86_64.jar\:lib/jackson-annotations-2.6.0.jar\:lib/jackson-core-2.6.5.jar\:lib/jackson-databind-2.6.5.jar\:lib/javacpp-1.4.jar\:lib/javacv-1.0-javadoc.jar\:lib/javacv-1.0-sources.jar\:lib/javacv-1.0.jar\:lib/javax.mail-api-1.6.0-javadoc.jar\:lib/javax.mail-api-1.6.0-sources.jar\:lib/javax.mail-api-1.6.0.jar\:lib/jblas-1.2.4-javadoc.jar\:lib/jblas-1.2.4-sources.jar\:lib/jblas-1.2.4.jar\:lib/jcommon-1.0.12.jar\:lib/jedis-2.9.0-javadoc.jar\:lib/jedis-2.9.0-sources.jar\:lib/jedis-2.9.0.jar\:lib/jfreechart-1.0.8a.jar\:lib/jhdf5-2.9-javadoc.jar\:lib/jhdf5-2.9-sources.jar\:lib/jhdf5-2.9.jar\:lib/jlfgr-1_0.jar\:lib/jmatio-1.2-javadoc.jar\:lib/jmatio-1.2-sources.jar\:lib/jmatio-1.2.jar\:lib/jna-4.2.2.jar\:lib/jna-platform-4.2.2.jar\:lib/jocl-2.0.2-natives-windows-i586.jar\:lib/jocl-main-2.0.2.jar\:lib/jogl-all-2.3.2-natives-linux-amd64.jar\:lib/jogl-all-2.3.2-natives-linux-i586.jar\:lib/jogl-all-2.3.2-natives-macosx-universal.jar\:lib/jogl-all-2.3.2-natives-solaris-amd64.jar\:lib/jogl-all-2.3.2-natives-solaris-i586.jar\:lib/jogl-all-2.3.2-natives-windows-amd64.jar\:lib/jogl-all-2.3.2-natives-windows-i586.jar\:lib/jogl-all-2.3.2.jar\:lib/jogl-all-main-2.3.2-javadoc.jar\:lib/jogl-all-main-2.3.2-sources.jar\:lib/jogl-all-main-2.3.2.jar\:lib/jsr305-1.3.9.jar\:lib/junit-4.11.jar\:lib/libdc1394-2.2.3-1.0.jar\:lib/libfreenect-0.5.2-1.0.jar\:lib/libtensorflow-1.12.0.jar\:lib/libtensorflow_jni-1.12.0.jar\:lib/libusb4java-1.2.0-linux-arm.jar\:lib/libusb4java-1.2.0-linux-x86.jar\:lib/libusb4java-1.2.0-linux-x86_64.jar\:lib/libusb4java-1.2.0-osx-x86.jar\:lib/libusb4java-1.2.0-osx-x86_64.jar\:lib/libusb4java-1.2.0-windows-x86.jar\:lib/libusb4java-1.2.0-windows-x86_64.jar\:lib/logback-classic-1.1.5.jar\:lib/logback-core-1.1.5.jar\:lib/lz4-1.5.0.jar\:lib/nrjavaserial-3.13.0-javadoc.jar\:lib/nrjavaserial-3.13.0-sources.jar\:lib/nrjavaserial-3.13.0.jar\:lib/ojalgo-44.0.0-javadoc.jar\:lib/ojalgo-44.0.0-sources.jar\:lib/ojalgo-44.0.0.jar\:lib/opencv-3.2.0-1-javadoc.jar\:lib/opencv-3.2.0-1-sources.jar\:lib/opencv-3.2.0-1.3-linux-x86.jar\:lib/opencv-3.2.0-1.3-linux-x86_64.jar\:lib/opencv-3.2.0-1.3-macosx-x86_64.jar\:lib/opencv-3.2.0-1.3-windows-x86.jar\:lib/opencv-3.2.0-1.3-windows-x86_64.jar\:lib/opencv-3.2.0-1.3.jar\:lib/opencv-3.2.0-1.jar\:lib/org.apache.commons.io-2.4-sources.jar\:lib/org.apache.commons.io-2.4.jar\:lib/scala-library-2.9.2.jar\:lib/semver-5.4.1-javadoc.jar\:lib/semver-5.4.1-sources.jar\:lib/semver-5.4.1.jar\:lib/slf4j-api-1.7.16.jar\:lib/svg-salamander-1.0-javadoc.jar\:lib/svg-salamander-1.0-sources.jar\:lib/svg-salamander-1.0.jar\:lib/swing-layout-1.0.3-javadoc.jar\:lib/swing-layout-1.0.3-sources.jar\:lib/swing-layout-1.0.3.jar\:lib/tensorflow-1.12.0.jar\:lib/uncommons-maths-1.2.2a-javadoc.jar\:lib/uncommons-maths-1.2.2a-sources.jar\:lib/uncommons-maths-1.2.2a.jar\:lib/usb4java-1.2.0-javadoc.jar\:lib/usb4java-1.2.0-sources.jar\:lib/usb4java-1.2.0.jar\:lib/videoinput-0.200-1.0.jar\:lib/yamlbeans-1.13-javadoc.jar\:lib/yamlbeans-1.13-sources.jar\:lib/yamlbeans-1.13.jar
+#Fri, 08 May 2020 15:21:09 +0200
+annotation.processing.enabled=false
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+ant.customtasks.libs=JWSAntTasks
+application.desc=Real-time event-based processing using neuromorphic AER sensors
+application.homepage=http\://jaerproject.net
+application.splash=src\\net\\sf\\jaer\\images\\SplashScreen.gif
+application.title=jAER
+application.vendor=Inst. of Neuroinformatics, Univesity of Zurich and ETH Zurich
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.eclipseFormatterActiveProfile=
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.eclipseFormatterEnabled=false
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.eclipseFormatterLocation=
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.enableFormatAsSaveAction=false
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.linefeed=
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.preserveBreakPoints=true
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.SaveActionModifiedLinesOnly=false
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.showNotifications=true
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.sourcelevel=
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.useProjectPref=true
+auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter46.useProjectSettings=false
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+debug.modulepath=${run.modulepath}
+debug.test.modulepath=${run.test.modulepath}
+endorsed.classpath=
+excludes=uk/ac/imperial/
+file.reference.=../../../../../..
+file.reference.ant.jar=jars/ant.jar
+file.reference.jogl-1_0_0-windows-i586.zip=jars/jogl-1_0_0-windows-i586.zip
+file.reference.message_generation-0.3.0.jar=jars/message_generation-0.3.0.jar
+file.reference.org.openni.jar=jars\\openni2\\org.openni.jar
+file.reference.rosjava-0.3.5.jar=jars/rosjava-0.3.5.jar
+file.reference.RXTXcomm.jar-1=jars/RXTXcomm.jar
+file.reference.UsbIoJava.jar-1=jars/UsbIoJava.jar
+file.reference.USBTransferThread-0.9.6.jar=jars/USBTransferThread-0.9.6.jar
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.index=${jnlp.enabled}
+javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=${javac.classpath}
+javac.test.modulepath=${javac.modulepath}
+javadoc.additionalparam=-J-Xmx512m -header "<a href\="http\://jaer.wiki.sourceforge.net">jAER project on SourceForge</a> - ${DSTAMP}" -overview "${basedir}/${src.dir}/overview.html"
+application.args=
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form,**/doc-files/**,**/package.html
+# This directory is removed when the project is cleaned:
+build.dir=build
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=${run.classpath}
+debug.test.classpath=${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/jAER.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+file.reference.java-src=src
+jar.compress=true
+javac.classpath=${file.reference.USBTransferThread-0.9.6.jar}\:${file.reference.UsbIoJava.jar-1}\:${file.reference.ant.jar}\:${file.reference.org.openni.jar}\:${file.reference.rosjava-0.3.5.jar}\:${file.reference.message_generation-0.3.0.jar}\:${ivy.classpath}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=true
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=${javac.classpath}\:${build.classes.dir}
+javadoc.author=true
+javadoc.encoding=
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=true
+javadoc.windowtitle=jAER javadoc
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+jnlp.applet.class=net.sf.jaer.jaerappletviewer.ClockApplet
+jnlp.applet.height=300
+jnlp.applet.width=300
+jnlp.codebase.type=local
+jnlp.codebase.url=file\:/C\:/Documents%20and%20Settings/tobi/My%20Documents/~jAER-sourceForge/trunk/host/java/dist/
+jnlp.descriptor=component
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
+main.class=net.sf.jaer.JAERViewer
+# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
+manifest.custom.application.library.allowable.codebase=
+# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
+manifest.custom.caller.allowable.codebase=
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
+manifest.custom.codebase=
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
+manifest.custom.permissions=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=true
+native.bundling.enabled=true
+platform.active=default_platform
+project.jSpikeStack=subprojects/JSpikeStack
+project.license=lgpl21
+run.classpath=${javac.classpath}\:${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=-Djava.library.path\=jars -Djava.util.logging.config.file\=conf/Logging.properties  -Dsun.java2d.noddraw\=true  -Dsun.java2d.opengl\=false -Djogl.disable.opengles\=false -splash\:SplashScreen.gif
+run.modulepath=${javac.modulepath}
+run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
+run.test.modulepath=${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=${file.reference.java-src}
+test.src.dir=test
+
+#filename of svn version
+buildversion.outputfile=${build.dir}/classes/BUILDVERSION.txt
+
+
+ivy.classpath=lib/annotations-1.0.0.jar\:lib/artoolkitplus-2.3.1-1.0.jar\:lib/bag-reader-java-1.10.0-javadoc.jar\:lib/bag-reader-java-1.10.0-sources.jar\:lib/bag-reader-java-1.10.0.jar\:lib/beansbinding-1.2.1.jar\:lib/commons-codec-1.10.jar\:lib/commons-compress-1.10.jar\:lib/commons-io-2.4.jar\:lib/commons-lang3-3.7-javadoc.jar\:lib/commons-lang3-3.7-sources.jar\:lib/commons-lang3-3.7.jar\:lib/commons-math3-3.6.1-javadoc.jar\:lib/commons-math3-3.6.1-sources.jar\:lib/commons-math3-3.6.1.jar\:lib/commons-net-3.6-javadoc.jar\:lib/commons-net-3.6-sources.jar\:lib/commons-net-3.6.jar\:lib/commons-pool2-2.4.2.jar\:lib/ffmpeg-2.7.1-1.0.jar\:lib/flandmark-1.07-1.0.jar\:lib/flycapture-2.7.3.19-1.0.jar\:lib/gluegen-rt-2.3.2-natives-linux-amd64.jar\:lib/gluegen-rt-2.3.2-natives-linux-i586.jar\:lib/gluegen-rt-2.3.2-natives-macosx-universal.jar\:lib/gluegen-rt-2.3.2-natives-solaris-amd64.jar\:lib/gluegen-rt-2.3.2-natives-solaris-i586.jar\:lib/gluegen-rt-2.3.2-natives-windows-amd64.jar\:lib/gluegen-rt-2.3.2-natives-windows-i586.jar\:lib/gluegen-rt-2.3.2.jar\:lib/gluegen-rt-main-2.3.2-javadoc.jar\:lib/gluegen-rt-main-2.3.2-sources.jar\:lib/gluegen-rt-main-2.3.2.jar\:lib/gson-2.8.2-javadoc.jar\:lib/gson-2.8.2-sources.jar\:lib/gson-2.8.2.jar\:lib/guava-18.0-javadoc.jar\:lib/guava-18.0-sources.jar\:lib/guava-18.0.jar\:lib/hamcrest-core-1.3.jar\:lib/hdf5-1.10.1-1.4-linux-x86.jar\:lib/hdf5-1.10.1-1.4-linux-x86_64.jar\:lib/hdf5-1.10.1-1.4-macosx-x86_64.jar\:lib/hdf5-1.10.1-1.4-windows-x86.jar\:lib/hdf5-1.10.1-1.4-windows-x86_64.jar\:lib/jackson-annotations-2.6.0.jar\:lib/jackson-core-2.6.5.jar\:lib/jackson-databind-2.6.5.jar\:lib/javacpp-1.4.jar\:lib/javacv-1.0-javadoc.jar\:lib/javacv-1.0-sources.jar\:lib/javacv-1.0.jar\:lib/javax.mail-api-1.6.0-javadoc.jar\:lib/javax.mail-api-1.6.0-sources.jar\:lib/javax.mail-api-1.6.0.jar\:lib/jblas-1.2.4-javadoc.jar\:lib/jblas-1.2.4-sources.jar\:lib/jblas-1.2.4.jar\:lib/jcommon-1.0.12.jar\:lib/jedis-2.9.0-javadoc.jar\:lib/jedis-2.9.0-sources.jar\:lib/jedis-2.9.0.jar\:lib/jfreechart-1.0.8a.jar\:lib/jhdf5-2.9-javadoc.jar\:lib/jhdf5-2.9-sources.jar\:lib/jhdf5-2.9.jar\:lib/jlfgr-1_0.jar\:lib/jmatio-1.2-javadoc.jar\:lib/jmatio-1.2-sources.jar\:lib/jmatio-1.2.jar\:lib/jna-4.2.2.jar\:lib/jna-platform-4.2.2.jar\:lib/jocl-2.0.2-natives-windows-i586.jar\:lib/jocl-main-2.0.2.jar\:lib/jogl-all-2.3.2-natives-linux-amd64.jar\:lib/jogl-all-2.3.2-natives-linux-i586.jar\:lib/jogl-all-2.3.2-natives-macosx-universal.jar\:lib/jogl-all-2.3.2-natives-solaris-amd64.jar\:lib/jogl-all-2.3.2-natives-solaris-i586.jar\:lib/jogl-all-2.3.2-natives-windows-amd64.jar\:lib/jogl-all-2.3.2-natives-windows-i586.jar\:lib/jogl-all-2.3.2.jar\:lib/jogl-all-main-2.3.2-javadoc.jar\:lib/jogl-all-main-2.3.2-sources.jar\:lib/jogl-all-main-2.3.2.jar\:lib/jsr305-1.3.9.jar\:lib/junit-4.11.jar\:lib/libdc1394-2.2.3-1.0.jar\:lib/libfreenect-0.5.2-1.0.jar\:lib/libtensorflow-1.14.0.jar\:lib/libtensorflow_jni-1.14.0.jar\:lib/libtensorflow_jni_gpu-1.14.0.jar\:lib/libusb4java-1.2.0-linux-arm.jar\:lib/libusb4java-1.2.0-linux-x86.jar\:lib/libusb4java-1.2.0-linux-x86_64.jar\:lib/libusb4java-1.2.0-osx-x86.jar\:lib/libusb4java-1.2.0-osx-x86_64.jar\:lib/libusb4java-1.2.0-windows-x86.jar\:lib/libusb4java-1.2.0-windows-x86_64.jar\:lib/logback-classic-1.1.5.jar\:lib/logback-core-1.1.5.jar\:lib/lz4-1.5.0.jar\:lib/nrjavaserial-3.13.0-javadoc.jar\:lib/nrjavaserial-3.13.0-sources.jar\:lib/nrjavaserial-3.13.0.jar\:lib/ojalgo-44.0.0-javadoc.jar\:lib/ojalgo-44.0.0-sources.jar\:lib/ojalgo-44.0.0.jar\:lib/opencv-3.2.0-1-javadoc.jar\:lib/opencv-3.2.0-1-sources.jar\:lib/opencv-3.2.0-1.3-linux-x86.jar\:lib/opencv-3.2.0-1.3-linux-x86_64.jar\:lib/opencv-3.2.0-1.3-macosx-x86_64.jar\:lib/opencv-3.2.0-1.3-windows-x86.jar\:lib/opencv-3.2.0-1.3-windows-x86_64.jar\:lib/opencv-3.2.0-1.3.jar\:lib/opencv-3.2.0-1.jar\:lib/org.apache.commons.io-2.4-sources.jar\:lib/org.apache.commons.io-2.4.jar\:lib/scala-library-2.9.2.jar\:lib/semver-5.4.1-javadoc.jar\:lib/semver-5.4.1-sources.jar\:lib/semver-5.4.1.jar\:lib/slf4j-api-1.7.16.jar\:lib/svg-salamander-1.0-javadoc.jar\:lib/svg-salamander-1.0-sources.jar\:lib/svg-salamander-1.0.jar\:lib/swing-layout-1.0.3-javadoc.jar\:lib/swing-layout-1.0.3-sources.jar\:lib/swing-layout-1.0.3.jar\:lib/tensorflow-1.14.0.jar\:lib/uncommons-maths-1.2.2a-javadoc.jar\:lib/uncommons-maths-1.2.2a-sources.jar\:lib/uncommons-maths-1.2.2a.jar\:lib/usb4java-1.2.0-javadoc.jar\:lib/usb4java-1.2.0-sources.jar\:lib/usb4java-1.2.0.jar\:lib/videoinput-0.200-1.0.jar\:lib/yamlbeans-1.13-javadoc.jar\:lib/yamlbeans-1.13-sources.jar\:lib/yamlbeans-1.13.jar
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 772490a20..153ca0f8d 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,6 +6,7 @@
             <extension file="jnlp-impl.xml" id="jws">
                 <dependency dependsOn="jnlp" target="jar"/>
             </extension>
+            <extension file="build-native.xml" id="j2sedeploy"/>
         </buildExtensions>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>jAER_1.6</name>