diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index e7ee401e812958e11ea4a8d45baae62fda2655eb..fe24b2c7d75cd10022dce95c331fcae024ad115e 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -2,6 +2,7 @@ file.reference.activation-1.1.jar=release/modules/ext/activation-1.1.jar
 file.reference.ant-1.8.2.jar=release/modules/ext/ant-1.8.2.jar
 file.reference.ant-launcher-1.8.2.jar=release/modules/ext/ant-launcher-1.8.2.jar
 file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar
+file.reference.avalon-framework-4.1.5.jar=release/modules/ext/avalon-framework-4.1.5.jar
 file.reference.commons-codec-1.5.jar=release/modules/ext/commons-codec-1.5.jar
 file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar
 file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
@@ -22,7 +23,6 @@ file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar
 file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar
 file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
 file.reference.jcalendarbutton-1.4.6.jar=release/modules/ext/jcalendarbutton-1.4.6.jar
-file.reference.jfxrt.jar=release/modules/ext/jfxrt.jar
 file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar
 file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
 file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 9fbf15e50c9c730c6dc86232b56e098cf25a5bb9..0af899f8a14ba1a642565fefde09bc621f5f6b07 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -746,188 +746,184 @@
                 <package>schemasMicrosoftComVml.impl</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
+                <runtime-relative-path>ext/commons-logging-1.1.2-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.1.2-sources.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javaee-api-5.0-2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javaee-api-5.0-2.jar</binary-origin>
+                <runtime-relative-path>ext/ant-launcher-1.8.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/ant-launcher-1.8.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/logkit-1.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/logkit-1.0.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-logging-1.1.2-javadoc.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.1.2-javadoc.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-io-2.4.jar</binary-origin>
+                <runtime-relative-path>ext/imgscalr-lib-4.2-javadoc.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imgscalr-lib-4.2-javadoc.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
+                <runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
+                <runtime-relative-path>ext/sigar-1.6.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sigar-1.6.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-3.8.jar</binary-origin>
+                <runtime-relative-path>ext/xmlbeans-2.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlbeans-2.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.1.2-javadoc.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.1.2-javadoc.jar</binary-origin>
+                <runtime-relative-path>ext/jna-3.4.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-3.4.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-schemas-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/activation-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/activation-1.1.jar</binary-origin>
+                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/platform-3.4.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/platform-3.4.0.jar</binary-origin>
+                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/ant-1.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ant-1.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.0-javadoc.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.0-javadoc.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/stax-api-1.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/stax-api-1.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/platform-3.4.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/platform-3.4.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-2.3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlbeans-2.3.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imgscalr-lib-4.2-sources.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imgscalr-lib-4.2-sources.jar</binary-origin>
+                <runtime-relative-path>ext/imgscalr-lib-4.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imgscalr-lib-4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imgscalr-lib-4.2-javadoc.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imgscalr-lib-4.2-javadoc.jar</binary-origin>
+                <runtime-relative-path>ext/ant-1.8.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/ant-1.8.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-3.4.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-3.4.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-codec-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.0-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.0-sources.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
+                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-11.0.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/ant-launcher-1.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ant-launcher-1.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/mail-1.4.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/mail-1.4.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jcalendarbutton-1.4.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcalendarbutton-1.4.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/geronimo-jms_1.1_spec-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/geronimo-jms_1.1_spec-1.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang3-3.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-logging-1.1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin>
+                <runtime-relative-path>ext/commons-io-2.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-io-2.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sigar-1.6.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sigar-1.6.4.jar</binary-origin>
+                <runtime-relative-path>ext/poi-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-3.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jfxrt.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jfxrt.jar</binary-origin>
+                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
+                <runtime-relative-path>ext/activation-1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/activation-1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sigar-1.6.4-sources.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sigar-1.6.4-sources.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
+                <runtime-relative-path>ext/jcalendarbutton-1.4.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcalendarbutton-1.4.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.0-javadoc.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang3-3.0-javadoc.jar</binary-origin>
+                <runtime-relative-path>ext/javaee-api-5.0-2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javaee-api-5.0-2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-3.8.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-3.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-scratchpad-3.8.jar</binary-origin>
+                <runtime-relative-path>ext/stax-api-1.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/stax-api-1.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
+                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-codec-1.5.jar</binary-origin>
+                <runtime-relative-path>ext/poi-excelant-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-excelant-3.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imgscalr-lib-4.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imgscalr-lib-4.2.jar</binary-origin>
+                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8.jar</binary-origin>
+                <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/logkit-1.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/logkit-1.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/sigar-1.6.4-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sigar-1.6.4-sources.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-11.0.2.jar</binary-origin>
+                <runtime-relative-path>ext/avalon-framework-4.1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/avalon-framework-4.1.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.0-sources.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang3-3.0-sources.jar</binary-origin>
+                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.1.2-sources.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.1.2-sources.jar</binary-origin>
+                <runtime-relative-path>ext/geronimo-jms_1.1_spec-1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/geronimo-jms_1.1_spec-1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-excelant-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-excelant-3.8.jar</binary-origin>
+                <runtime-relative-path>ext/poi-scratchpad-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-3.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/avalon-framework-4.1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/avalon-framework-4.1.5.jar</binary-origin>
+                <runtime-relative-path>ext/imgscalr-lib-4.2-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imgscalr-lib-4.2-sources.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>