diff --git a/intrace.appengine/.classpath b/intrace.appengine/.classpath
index 074a56b..c1374bb 100644
--- a/intrace.appengine/.classpath
+++ b/intrace.appengine/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_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="con" path="org.eclipse.jdt.launching.JRE_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 f1d58f4..d1c6ef2 100644
--- a/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs
+++ b/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,7 +1,7 @@
-#Tue Aug 21 16:29:05 BST 2012
 eclipse.preferences.version=1
-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
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.2.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.2.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|jsr107cache-1.1.jar
 gaeDeployDialogSettings=
 gaeIsEclipseDefaultInstPath=true
+gaeLaunchAppInBrowser=true
 googleCloudSqlEnabled=false
 localDevMySqlEnabled=true
diff --git a/intrace.appengine/.settings/org.eclipse.jdt.core.prefs b/intrace.appengine/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..838bd9d
--- /dev/null
+++ b/intrace.appengine/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/intrace.appengine/war/WEB-INF/appengine-web.xml b/intrace.appengine/war/WEB-INF/appengine-web.xml
index e25753c..5480677 100644
--- a/intrace.appengine/war/WEB-INF/appengine-web.xml
+++ b/intrace.appengine/war/WEB-INF/appengine-web.xml
@@ -1,23 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-	<application>intracesite</application>
-	<version>1</version>
-	
-	<!-- Configure java.util.logging -->
-	<system-properties>
-		<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
-	</system-properties>
-	
-	<static-files>
-    <include path="/**.html" />   
-    <include path="/**.xml" />
-    <include path="/features/**" />
-    <exclude path="/plugins/**" />
-    <exclude path="/files/**" />
-  </static-files>
-  
-  <admin-console>
-    <page name="Downloads" url="/downloads.jsp" />
-  </admin-console>
-	
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+	<application>intracesite</application>
+	<version>1</version>
+	
+	<!-- Configure java.util.logging -->
+	<system-properties>
+		<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
+	</system-properties>
+	
+	<static-files>
+    <include path="/**.html" />   
+    <include path="/**.xml" />
+    <include path="/features/**" />
+    <exclude path="/plugins/**" />
+    <exclude path="/files/**" />
+  </static-files>
+  
+  <admin-console>
+    <page name="Downloads" url="/downloads.jsp" />
+  </admin-console>
+	
+	<threadsafe>true</threadsafe>
+	
 </appengine-web-app>
\ No newline at end of file
diff --git a/intrace.appengine/war/WEB-INF/classes/META-INF/jdoconfig.xml b/intrace.appengine/war/WEB-INF/classes/META-INF/jdoconfig.xml
index 5f56aa1..82ab1a4 100644
--- a/intrace.appengine/war/WEB-INF/classes/META-INF/jdoconfig.xml
+++ b/intrace.appengine/war/WEB-INF/classes/META-INF/jdoconfig.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
-
-   <persistence-manager-factory name="transactions-optional">
-       <property name="javax.jdo.PersistenceManagerFactoryClass"
-           value="org.datanucleus.store.appengine.jdo.DatastoreJDOPersistenceManagerFactory"/>
-       <property name="javax.jdo.option.ConnectionURL" value="appengine"/>
-       <property name="javax.jdo.option.NontransactionalRead" value="true"/>
-       <property name="javax.jdo.option.NontransactionalWrite" value="true"/>
-       <property name="javax.jdo.option.RetainValues" value="true"/>
-       <property name="datanucleus.appengine.autoCreateDatastoreTxns" value="true"/>
-   </persistence-manager-factory>
-</jdoconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+
+   <persistence-manager-factory name="transactions-optional">
+       <property name="javax.jdo.PersistenceManagerFactoryClass"
+           value="org.datanucleus.store.appengine.jdo.DatastoreJDOPersistenceManagerFactory"/>
+       <property name="javax.jdo.option.ConnectionURL" value="appengine"/>
+       <property name="javax.jdo.option.NontransactionalRead" value="true"/>
+       <property name="javax.jdo.option.NontransactionalWrite" value="true"/>
+       <property name="javax.jdo.option.RetainValues" value="true"/>
+       <property name="datanucleus.appengine.autoCreateDatastoreTxns" value="true"/>
+   </persistence-manager-factory>
+</jdoconfig>
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar
deleted file mode 100644
index c900be5..0000000
Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar and /dev/null differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.2.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.2.jar
new file mode 100644
index 0000000..0c239a3
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.2.jar 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
deleted file mode 100644
index 49bc35e..0000000
Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.4.jar and /dev/null differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs.jar
new file mode 100644
index 0000000..39fe8ee
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs.jar differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-endpoints-deps.jar b/intrace.appengine/war/WEB-INF/lib/appengine-endpoints-deps.jar
new file mode 100644
index 0000000..6bcf71e
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-endpoints-deps.jar differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-endpoints.jar b/intrace.appengine/war/WEB-INF/lib/appengine-endpoints.jar
new file mode 100644
index 0000000..05c8d35
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-endpoints.jar 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
deleted file mode 100644
index a282b97..0000000
Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.4.jar and /dev/null differ
diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.9.2.jar b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.9.2.jar
new file mode 100644
index 0000000..7ac4e48
Binary files /dev/null and b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.9.2.jar differ