diff --git a/intrace.appengine/.classpath b/intrace.appengine/.classpath
index 37202b8..074a56b 100644
--- a/intrace.appengine/.classpath
+++ b/intrace.appengine/.classpath
@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/joda-time-2.0.jar"/>
 	<classpathentry kind="src" path="testsrc"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs b/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs
index e24eb44..3ea32a6 100644
--- a/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs
+++ b/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,6 +1,6 @@
-#Mon Apr 23 22:05:36 BST 2012
+#Mon Apr 23 22:28:35 BST 2012
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.6.1.jar|appengine-api-labs-1.6.1.jar|appengine-jsr107cache-1.6.1.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.6.4.jar|appengine-api-labs-1.6.4.jar|appengine-jsr107cache-1.6.4.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
 gaeDeployDialogSettings=
 gaeIsEclipseDefaultInstPath=true
 googleCloudSqlEnabled=false
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar
similarity index 80%
rename from intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar
rename to intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar
index 5a8a4b0..c900be5 100644
Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar and b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.1.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.1.jar
deleted file mode 100644
index 5821a37..0000000
Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.1.jar and /dev/null differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.4.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.4.jar
new file mode 100644
index 0000000..49bc35e
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.4.jar differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.1.jar b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.1.jar
deleted file mode 100644
index 0c40682..0000000
Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.1.jar and /dev/null differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.4.jar b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.4.jar
new file mode 100644
index 0000000..a282b97
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.4.jar differ
diff --git a/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar b/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar
index 9867b2e..668a7f8 100644
Binary files a/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar and b/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar differ