Merge remote-tracking branch 'remotes/origin/master' into Story_76

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
2017-09-09 15:35:02 +12:00
parent 5e516b0508 14aaf26b73
commit ea1594a839
91 changed files with 3597 additions and 833 deletions
@@ -106,6 +106,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>