diff --git a/.classpath b/.classpath
index be02d8d67..9e4872afa 100644
--- a/.classpath
+++ b/.classpath
@@ -10,7 +10,7 @@
 	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
-	<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar" sourcepath="/home/megabug/git/fest-swing-1.2-sources.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
@@ -20,6 +20,13 @@
 	<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
+	<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-149.jar"/>
+	<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-149.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-core-2.2.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-databind-2.2.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.2.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.2.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
 	<classpathentry kind="output" path="app/bin"/>
 </classpath>
diff --git a/app/.classpath b/app/.classpath
index aca931155..04e0ff1fd 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -7,10 +7,17 @@
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
+	<classpathentry kind="lib" path="lib/bcpg-jdk15on-149.jar"/>
+	<classpathentry kind="lib" path="lib/bcprov-jdk15on-149.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-annotations-2.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-core-2.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-databind-2.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
diff --git a/app/lib/bcpg-jdk15on-149.jar b/app/lib/bcpg-jdk15on-149.jar
new file mode 100644
index 000000000..b5306e06d
Binary files /dev/null and b/app/lib/bcpg-jdk15on-149.jar differ
diff --git a/app/lib/bcprov-jdk15on-149.jar b/app/lib/bcprov-jdk15on-149.jar
new file mode 100644
index 000000000..e1d4bb31c
Binary files /dev/null and b/app/lib/bcprov-jdk15on-149.jar differ
diff --git a/app/lib/commons-compress-1.8.jar b/app/lib/commons-compress-1.8.jar
new file mode 100644
index 000000000..940b06873
Binary files /dev/null and b/app/lib/commons-compress-1.8.jar differ
diff --git a/app/lib/jackson-annotations-2.2.3.jar b/app/lib/jackson-annotations-2.2.3.jar
new file mode 100644
index 000000000..b62c87d7e
Binary files /dev/null and b/app/lib/jackson-annotations-2.2.3.jar differ
diff --git a/app/lib/jackson-core-2.2.3.jar b/app/lib/jackson-core-2.2.3.jar
new file mode 100644
index 000000000..24318a464
Binary files /dev/null and b/app/lib/jackson-core-2.2.3.jar differ
diff --git a/app/lib/jackson-databind-2.2.3.jar b/app/lib/jackson-databind-2.2.3.jar
new file mode 100644
index 000000000..854508478
Binary files /dev/null and b/app/lib/jackson-databind-2.2.3.jar differ
diff --git a/app/lib/jackson-module-mrbean-2.2.3.jar b/app/lib/jackson-module-mrbean-2.2.3.jar
new file mode 100644
index 000000000..a4a3b738e
Binary files /dev/null and b/app/lib/jackson-module-mrbean-2.2.3.jar differ
diff --git a/arduino-core/.classpath b/arduino-core/.classpath
index bf61b5826..88c545b34 100644
--- a/arduino-core/.classpath
+++ b/arduino-core/.classpath
@@ -9,5 +9,15 @@
 	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
+	<classpathentry kind="lib" path="../app/lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="../app/lib/commons-compress-1.8.jar"/>
+	<classpathentry kind="lib" path="../app/lib/commons-exec-1.1.jar"/>
+	<classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="../app/lib/jackson-annotations-2.2.3.jar"/>
+	<classpathentry kind="lib" path="../app/lib/jackson-core-2.2.3.jar"/>
+	<classpathentry kind="lib" path="../app/lib/jackson-databind-2.2.3.jar"/>
+	<classpathentry kind="lib" path="../app/lib/jackson-module-mrbean-2.2.3.jar"/>
+	<classpathentry kind="lib" path="../app/lib/bcpg-jdk15on-149.jar"/>
+	<classpathentry kind="lib" path="../app/lib/bcprov-jdk15on-149.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/arduino-core/lib/bcpg-jdk15on-149.jar b/arduino-core/lib/bcpg-jdk15on-149.jar
new file mode 100644
index 000000000..b5306e06d
Binary files /dev/null and b/arduino-core/lib/bcpg-jdk15on-149.jar differ
diff --git a/arduino-core/lib/bcprov-jdk15on-149.jar b/arduino-core/lib/bcprov-jdk15on-149.jar
new file mode 100644
index 000000000..e1d4bb31c
Binary files /dev/null and b/arduino-core/lib/bcprov-jdk15on-149.jar differ
diff --git a/arduino-core/lib/commons-compress-1.8.jar b/arduino-core/lib/commons-compress-1.8.jar
new file mode 100644
index 000000000..940b06873
Binary files /dev/null and b/arduino-core/lib/commons-compress-1.8.jar differ
diff --git a/arduino-core/lib/jackson-annotations-2.2.3.jar b/arduino-core/lib/jackson-annotations-2.2.3.jar
new file mode 100644
index 000000000..b62c87d7e
Binary files /dev/null and b/arduino-core/lib/jackson-annotations-2.2.3.jar differ
diff --git a/arduino-core/lib/jackson-core-2.2.3.jar b/arduino-core/lib/jackson-core-2.2.3.jar
new file mode 100644
index 000000000..24318a464
Binary files /dev/null and b/arduino-core/lib/jackson-core-2.2.3.jar differ
diff --git a/arduino-core/lib/jackson-databind-2.2.3.jar b/arduino-core/lib/jackson-databind-2.2.3.jar
new file mode 100644
index 000000000..854508478
Binary files /dev/null and b/arduino-core/lib/jackson-databind-2.2.3.jar differ
diff --git a/arduino-core/lib/jackson-module-mrbean-2.2.3.jar b/arduino-core/lib/jackson-module-mrbean-2.2.3.jar
new file mode 100644
index 000000000..a4a3b738e
Binary files /dev/null and b/arduino-core/lib/jackson-module-mrbean-2.2.3.jar differ
diff --git a/build/build.xml b/build/build.xml
index a1bc1fa48..935bd4658 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -50,17 +50,7 @@
   <fileset dir=".." id="runtime.jars">
     <include name="arduino-core/arduino-core.jar" />
     <include name="app/pde.jar" />
-    <include name="app/lib/commons-codec-1.7.jar" />
-    <include name="app/lib/commons-exec-1.1.jar" />
-    <include name="app/lib/commons-httpclient-3.1.jar" />
-    <include name="app/lib/commons-logging-1.0.4.jar" />
-    <include name="app/lib/ecj.jar" />
-    <include name="app/lib/jmdns-3.4.1.jar" />
-    <include name="app/lib/jna.jar" />
-    <include name="app/lib/jsch-0.1.50.jar" />
-    <include name="app/lib/jssc-2.8.0.jar" />
-    <include name="app/lib/ant.jar" />
-    <include name="app/lib/ant-launcher.jar" />
+    <include name="app/lib/*.jar" />
   </fileset>
 
   <target name="build" description="Build Arduino.">
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index e5c1a97a7..72287cf50 100755
--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@@ -97,7 +97,7 @@
       <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
            it can cause problems if users have installed weird files there.
            http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jna.jar</string>
+      <string>$JAVAROOT/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/bcpg-jdk15on-149.jar:$JAVAROOT/bcprov-jdk15on-149.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/jackson-annotations-2.2.3.jar:$JAVAROOT/jackson-core-2.2.3.jar:$JAVAROOT/jackson-databind-2.2.3.jar:$JAVAROOT/jackson-module-mrbean-2.2.3.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jna.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar</string>
 
       <key>JVMArchs</key>  
       <array>  
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index eb29a7153..ca92b954f 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -15,17 +15,28 @@
   <icon>application.ico</icon>
   <classPath>
     <mainClass>processing.app.Base</mainClass>
+    <cp>lib/antlr.jar</cp>
+    <cp>lib/apple.jar</cp>
     <cp>lib/arduino-core.jar</cp>
-    <cp>lib/pde.jar</cp>
+    <cp>lib/bcpg-jdk15on-149.jar</cp>
+    <cp>lib/bcprov-jdk15on-149.jar</cp>
     <cp>lib/commons-codec-1.7.jar</cp>
+    <cp>lib/commons-compress-1.8.jar</cp>
     <cp>lib/commons-exec-1.1.jar</cp>
     <cp>lib/commons-httpclient-3.1.jar</cp>
+    <cp>lib/commons-lang3-3.3.2.jar</cp>
     <cp>lib/commons-logging-1.0.4.jar</cp>
     <cp>lib/ecj.jar</cp>
+    <cp>lib/guava-18.0.jar</cp>
+    <cp>lib/jackson-annotations-2.2.3.jar</cp>
+    <cp>lib/jackson-core-2.2.3.jar</cp>
+    <cp>lib/jackson-databind-2.2.3.jar</cp>
+    <cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
     <cp>lib/jmdns-3.4.1.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/jsch-0.1.50.jar</cp>
     <cp>lib/jssc-2.8.0.jar</cp>
+    <cp>lib/pde.jar</cp>
   </classPath>
   <jre>
     <path>java</path>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index d59060f67..31ccbe1d4 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -15,17 +15,28 @@
   <icon>application.ico</icon>
   <classPath>
     <mainClass>processing.app.Base</mainClass>
+    <cp>lib/antlr.jar</cp>
+    <cp>lib/apple.jar</cp>
     <cp>lib/arduino-core.jar</cp>
-    <cp>lib/pde.jar</cp>
+    <cp>lib/bcpg-jdk15on-149.jar</cp>
+    <cp>lib/bcprov-jdk15on-149.jar</cp>
     <cp>lib/commons-codec-1.7.jar</cp>
+    <cp>lib/commons-compress-1.8.jar</cp>
     <cp>lib/commons-exec-1.1.jar</cp>
     <cp>lib/commons-httpclient-3.1.jar</cp>
+    <cp>lib/commons-lang3-3.3.2.jar</cp>
     <cp>lib/commons-logging-1.0.4.jar</cp>
     <cp>lib/ecj.jar</cp>
+    <cp>lib/guava-18.0.jar</cp>
+    <cp>lib/jackson-annotations-2.2.3.jar</cp>
+    <cp>lib/jackson-core-2.2.3.jar</cp>
+    <cp>lib/jackson-databind-2.2.3.jar</cp>
+    <cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
     <cp>lib/jmdns-3.4.1.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/jsch-0.1.50.jar</cp>
     <cp>lib/jssc-2.8.0.jar</cp>
+    <cp>lib/pde.jar</cp>
   </classPath>
   <jre>
     <path>java</path>