More changes
Changes
Merge branch 'dev' of github.com:rthoth/neo4j-3d into dev

Conflicts:
	build.sbt
	src/main/java/neo4j3D/api/Layer.java
	src/main/java/neo4j3D/api/SpatialGraphDatabaseService.java
	src/main/java/org/neo4j/gis3d/Gis3DProperties.java
	src/main/java/org/neo4j/gis3d/Gis3DRelationshipTypes.java
	src/main/java/org/neo4j/gis3d/core/DefaultLayer.java
	src/test/scala/org/neo4j/gis3d/api/test/Gis3DDatabaseServiceSpec.scala
	src/test/scala/org/neo4j/gis3d/test/Neo4jGraphTest.scala