Merge branch 'master' into vmg_fix

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java

racevisionGame/pom.xml

@@ -66,14 +66,17 @@
             <version>15.0</version>
         </dependency>
 
-
-
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-referencing</artifactId>
             <version>9.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>JavaInteractiveMesh</groupId>
+            <artifactId>STLImporter</artifactId>
+            <version>0.7</version>
+        </dependency>
 
     </dependencies>
 
@@ -92,7 +95,11 @@
             <url>http://download.osgeo.org/webdav/geotools/</url>
         </repository>
 
-
+        <repository>
+            <id>interactivemesh</id>
+            <name>Interactive Mesh</name>
+            <url>http://umbrasheep.com:8888/repository/internal/</url>
+        </repository>
 
 
     </repositories>
@@ -183,6 +190,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.8.1</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>