diff --git a/extensions/freebase/.classpath b/extensions/freebase/.classpath
index 67ae00005..14d81eb4f 100644
--- a/extensions/freebase/.classpath
+++ b/extensions/freebase/.classpath
@@ -6,11 +6,18 @@
 	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/json-20100208.jar" sourcepath="/grefine/webapp/WEB-INF/lib-src/json-20100208-sources.jar"/>
 	<classpathentry kind="lib" path="/grefine-server/lib/servlet-api-2.5.jar" sourcepath="/grefine-server/lib-src/servlet-api-2.5-sources.jar"/>
 	<classpathentry kind="lib" path="/grefine-server/lib/slf4j-api-1.5.6.jar"/>
-	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/httpclient-4.0.1.jar" sourcepath="/grefine/webapp/WEB-INF/lib-src/httpclient-4.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/httpcore-4.0.1.jar" sourcepath="/grefine/webapp/WEB-INF/lib-src/httpcore-4.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.1.jar"/>
-	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/signpost-core-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/httpclient-4.2.5.jar" sourcepath="/grefine/webapp/WEB-INF/lib-src/httpclient-4.2.5-sources.jar"/>
+	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/httpcore-4.2.4.jar" sourcepath="/grefine/webapp/WEB-INF/lib-src/httpcore-4.2.4-sources.jar"/>
+	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar"/>
+	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/signpost-core-1.2.1.2.jar"/>
 	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/commons-lang-2.5.jar" sourcepath="/grefine/webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-http-client-jackson-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-api-client-1.13.2-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-api-services-freebase-v1-rev25-1.13.2-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-http-client-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-oauth-client-servlet-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/mail.jar"/>
 	<classpathentry kind="output" path="module/MOD-INF/classes"/>
 </classpath>
diff --git a/extensions/gdata/.classpath b/extensions/gdata/.classpath
index 8019f30db..062d8b6a7 100644
--- a/extensions/gdata/.classpath
+++ b/extensions/gdata/.classpath
@@ -9,7 +9,22 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/grefine"/>
 	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-core-1.0.jar"/>
 	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-spreadsheet-3.0.jar"/>
-	<classpathentry kind="lib" path="module/MOD-INF/lib/google-collect-1.0-rc1.jar"/>
-	<classpathentry kind="lib" path="/grefine-all/extensions/gdata/module/MOD-INF/lib/gdata-docs-3.0.jar"/>
+	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/butterfly-1.0.1.jar"/>
+	<classpathentry kind="lib" path="/grefine/webapp/WEB-INF/lib/jackson-core-asl-1.9.12.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-api-client-1.13.2-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-base-1.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-client-1.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-client-meta-1.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-docs-3.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-docs-meta-3.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-media-1.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/gdata-spreadsheet-meta-3.0.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-api-services-fusiontables-v1-rev17-1.13.2-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-http-client-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-http-client-jackson-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-oauth-client-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/google-oauth-client-servlet-1.13.1-beta.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jsr305-1.3.9.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/mail.jar"/>
 	<classpathentry kind="output" path="module/MOD-INF/classes"/>
 </classpath>
diff --git a/extensions/jython/.classpath b/extensions/jython/.classpath
index 63efa2fd5..5cd89185c 100644
--- a/extensions/jython/.classpath
+++ b/extensions/jython/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/grefine"/>
-	<classpathentry kind="lib" path="module/MOD-INF/lib/jython-2.5.1.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jython-standalone-2.5.3.jar"/>
 	<classpathentry kind="output" path="module/MOD-INF/classes"/>
 </classpath>
diff --git a/main/.classpath b/main/.classpath
index 8f91da74c..bbf337340 100644
--- a/main/.classpath
+++ b/main/.classpath
@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="tests/server/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/butterfly-trunk.jar" sourcepath="webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-codec-1.5.jar" sourcepath="webapp/WEB-INF/lib-src/commons-codec-1.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/butterfly-1.0.1.jar" sourcepath="webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-codec-1.6.jar" sourcepath="webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-lang-2.5.jar" sourcepath="webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar" sourcepath="webapp/WEB-INF/lib-src/commons-fileupload-1.2.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/json-20100208.jar" sourcepath="webapp/WEB-INF/lib-src/json-20100208-sources.jar"/>
@@ -13,18 +13,18 @@
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/secondstring-20100303.jar" sourcepath="webapp/WEB-INF/lib-src/secondstring-20100303-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/ant-tools-1.8.0.jar" sourcepath="webapp/WEB-INF/lib-src/ant-tools-1.8.0-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/vicino-1.1.jar" sourcepath="webapp/WEB-INF/lib-src/vicino-1.1-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/opencsv-2.2.jar" sourcepath="tests/java/lib-src/opencsv-2.2-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/opencsv-2.4-SNAPSHOT.jar" sourcepath="tests/java/lib-src/opencsv-2.4-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar" sourcepath="webapp/WEB-INF/lib-src/jcl-over-slf4j-1.5.6-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/slf4j-api-1.5.6.jar" sourcepath="webapp/WEB-INF/lib/slf4j-api-1.5.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar" sourcepath="webapp/WEB-INF/lib-src/slf4j-log4j12-1.5.6-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/log4j-1.2.15.jar" sourcepath="webapp/WEB-INF/lib-src/log4j-1.2.15-sources.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-3.7-20101029.jar" sourcepath="webapp/WEB-INF/lib-src/poi-3.6-sources.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-ooxml-3.7-20101029.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-ooxml-schemas-3.7-20101029.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-3.8-20120326.jar" sourcepath="webapp/WEB-INF/lib-src/poi-src-3.8.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-ooxml-3.8-20120326.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
 	<classpathentry exported="true" kind="lib" path="webapp/WEB-INF/lib/dom4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/xmlbeans-2.3.0.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/clojure-1.4.0.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/jackson-core-asl-1.5.1.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/clojure-1.5.1-slim.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/jackson-core-asl-1.9.12.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/marc4j-2.4.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/jrdf-0.5.6.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
@@ -32,13 +32,15 @@
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/rhino-1.7R2.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/velocity-1.5.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/lessen-trunk-r8.jar"/>
-	<classpathentry kind="lib" path="tests/server/lib/mockito-all-1.8.4.jar" sourcepath="tests/server/lib-src/mockito-all-1.8.4-sources.jar"/>
-	<classpathentry kind="lib" path="tests/server/lib/testng-5.12.1.jar" sourcepath="tests/server/lib-src/testng-5.12.1-sources.jar"/>
+	<classpathentry kind="lib" path="tests/server/lib/mockito-all-1.9.5.jar" sourcepath="tests/server/lib-src/mockito-all-1.9.5-sources.jar"/>
+	<classpathentry kind="lib" path="tests/server/lib/testng-6.8.jar" sourcepath="tests/server/lib-src/testng-6.8-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/grefine-server/lib/servlet-api-2.5.jar" sourcepath="/grefine-server/lib-src/servlet-api-2.5-sources.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/httpclient-4.0.1.jar" sourcepath="webapp/WEB-INF/lib-src/httpclient-4.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/httpcore-4.0.1.jar" sourcepath="webapp/WEB-INF/lib-src/httpcore-4.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.1.jar"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/signpost-core-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/httpclient-4.2.5.jar" sourcepath="webapp/WEB-INF/lib-src/httpclient-4.2.5-sources.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/httpcore-4.2.4.jar" sourcepath="webapp/WEB-INF/lib-src/httpcore-4.2.4-sources.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/signpost-core-1.2.1.2.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/jsoup-1.4.1.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/odfdom-java-0.8.7.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/guava-13.0.jar"/>
 	<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
 </classpath>
diff --git a/main/tests/server/lib-src/mockito-all-1.8.4-sources.jar b/main/tests/server/lib-src/mockito-all-1.9.5-sources.jar
similarity index 58%
rename from main/tests/server/lib-src/mockito-all-1.8.4-sources.jar
rename to main/tests/server/lib-src/mockito-all-1.9.5-sources.jar
index c14e3ba1d..743e36bf4 100644
Binary files a/main/tests/server/lib-src/mockito-all-1.8.4-sources.jar and b/main/tests/server/lib-src/mockito-all-1.9.5-sources.jar differ
diff --git a/main/tests/server/lib-src/testng-5.12.1-sources.jar b/main/tests/server/lib-src/testng-5.12.1-sources.jar
deleted file mode 100644
index e50b12fa4..000000000
Binary files a/main/tests/server/lib-src/testng-5.12.1-sources.jar and /dev/null differ
diff --git a/main/tests/server/lib-src/testng-6.8-sources.jar b/main/tests/server/lib-src/testng-6.8-sources.jar
new file mode 100644
index 000000000..160f529a7
Binary files /dev/null and b/main/tests/server/lib-src/testng-6.8-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/commons-codec-1.5-sources.jar b/main/webapp/WEB-INF/lib-src/commons-codec-1.5-sources.jar
deleted file mode 100644
index 0685869df..000000000
Binary files a/main/webapp/WEB-INF/lib-src/commons-codec-1.5-sources.jar and /dev/null differ
diff --git a/main/webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar b/main/webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar
new file mode 100644
index 000000000..cc6abff9e
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/httpclient-4.1.2-sources.jar b/main/webapp/WEB-INF/lib-src/httpclient-4.1.2-sources.jar
deleted file mode 100644
index 3c856b99e..000000000
Binary files a/main/webapp/WEB-INF/lib-src/httpclient-4.1.2-sources.jar and /dev/null differ
diff --git a/main/webapp/WEB-INF/lib-src/httpclient-4.2.5-sources.jar b/main/webapp/WEB-INF/lib-src/httpclient-4.2.5-sources.jar
new file mode 100644
index 000000000..410955ca6
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/httpclient-4.2.5-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/httpcore-4.1.3-sources.jar b/main/webapp/WEB-INF/lib-src/httpcore-4.1.3-sources.jar
deleted file mode 100644
index 0ded3bbec..000000000
Binary files a/main/webapp/WEB-INF/lib-src/httpcore-4.1.3-sources.jar and /dev/null differ
diff --git a/main/webapp/WEB-INF/lib-src/httpcore-4.2.4-sources.jar b/main/webapp/WEB-INF/lib-src/httpcore-4.2.4-sources.jar
new file mode 100644
index 000000000..afc10cddf
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/httpcore-4.2.4-sources.jar differ