Merge remote-tracking branch 'origin/0.25-neo4j-3.0' into 0.25-neo4j-3.1

Author: craigtaverner

.gitignore

@@ -22,4 +22,4 @@ target
 /bin
 LineString.*
 results.*
-
+docs/*

LICENSE.txt

@@ -1,22 +1,22 @@
 Neo4j
-Copyright © 2002-2011 Network Engine for Objects in Lund AB (referred to
-in this notice as “Neo Technology”)
+Copyright © 2002-2017 Network Engine for Objects in Lund AB (referred to
+in this notice as "Neo Technology")
    [http://neotechnology.com]
 
 This product includes software ("Software") developed by Neo Technology.
 
 The copyright in the bundled Neo4j graph database (including the
 Software) is owned by Neo Technology. The Software developed and owned
-by Neo Technology is licensed under the GNU AFFERO GENERAL PUBLIC
-LICENSE Version 3 (http://www.fsf.org/licensing/licenses/agpl-3.0.html)
-("AGPL") to all third parties and that license, as required by the AGPL,
-is included in the LICENSE.txt file.
+by Neo Technology is licensed under the GNU GENERAL PUBLIC LICENSE
+Version 3 (http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL")
+to all third parties and that license, as required by the GPL, is
+included in the LICENSE.txt file.
 
 However, if you have executed an End User Software License and Services
 Agreement or an OEM Software License and Support Services Agreement, or
 another commercial license agreement with Neo Technology or one of its
 affiliates (each, a "Commercial Agreement"), the terms of the license in
-such Commercial Agreement will supersede the AGPL and you may use the
+such Commercial Agreement will supersede the GPL and you may use the
 software solely pursuant to the terms of the relevant Commercial
 Agreement.
 

NOTICE.txt

@@ -222,6 +222,8 @@ The Neo4j Spatial Plugin is available for inclusion in the server version of Neo
   * [v0.23 for Neo4j 3.0.4](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.23-neo4j-3.0.4/neo4j-spatial-0.23-neo4j-3.0.4-server-plugin.jar?raw=true)
   * [v0.24.1 for Neo4j 3.0.8](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.24.1-neo4j-3.0.8/neo4j-spatial-0.24.1-neo4j-3.0.8-server-plugin.jar?raw=true)
   * [v0.24.1 for Neo4j 3.1.1](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.24.1-neo4j-3.1.1/neo4j-spatial-0.24.1-neo4j-3.1.1-server-plugin.jar?raw=true)
+  * [v0.25 for Neo4j 3.0.8](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25-neo4j-3.0.8/neo4j-spatial-0.25-neo4j-3.0.8-server-plugin.jar?raw=true)
+  * [v0.25 for Neo4j 3.1.4](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25-neo4j-3.1.4/neo4j-spatial-0.25-neo4j-3.1.4-server-plugin.jar?raw=true)
 
 For versions up to 0.15-neo4j-2.3.4:
 
@@ -337,7 +339,7 @@ Add the following repositories and dependency to your project's pom.xml:
     <dependency>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-spatial</artifactId>
-        <version>0.24.1-neo4j-3.1.1</version>
+        <version>0.25-neo4j-3.1.4</version>
     </dependency>
 ~~~