Merge branch 'master' of

https://github.com/openworm/org.openworm.website.git

Conflicts:
	war/index.html

Author: tarelli

.classpath

@@ -2,6 +2,6 @@
 <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="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/appengine-java-sdk-1.9.42"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>

.settings/com.google.appengine.eclipse.core.prefs

@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.42.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.42.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
+filesCopiedToWebInfLib=
 gaeDeployDialogSettings=
 gaeIsEclipseDefaultInstPath=true
 gaeLaunchAppInBrowser=true

war/index.html

@@ -377,7 +377,7 @@ <h1>Open Science at its best.</h1>
 			    <h2>Source code</h2>
 			    <p>
 				All the code produced as part of the OpenWorm project is on
-				<a href="http://docs.openworm.org/en/latest/Community/github.html#github"
+				<a href="http://docs.openworm.org/en/latest/Community/github/"
 				   target="_blank">GitHub</a>
 				under
 				<a href="http://opensource.org/licenses/MIT" target="_blank">MIT</a>