Merge branch 'xray-gettingstarted' into xray

Conflicts:
	.ebextensions/xray.config
	build.gradle
	public/index.html
	src/main/java/scorekeep/WebConfig.java

Author: Michael Wunderlich

public/app/gameController.js

@@ -72,5 +72,8 @@ function Game($q, $scope, $http, $interval, $routeParams, SessionService, UserSe
 
     });
   }
-
+  $scope.$on('$destroy',function(){
+    if($scope.interval)
+        $interval.cancel($scope.interval);
+  });
 }

public/app/sessionController.js

@@ -41,7 +41,6 @@ function Session($scope, $http, $location, $interval, $routeParams, SessionServi
   $scope.interval = $interval(function(){
     $scope.loadSession();
   }, 5000);
-
   $scope.createGame = function (gamename, gamerules) {
     var sessionid = $routeParams.sessionid;
 
@@ -95,4 +94,8 @@ function Session($scope, $http, $location, $interval, $routeParams, SessionServi
       $location.path('/');
     });
   };
+  $scope.$on('$destroy',function(){
+    if($scope.interval)
+        $interval.cancel($scope.interval);
+  });
 }

public/css/scorekeep.css

@@ -12,6 +12,12 @@ body {
   text-align: center;
 }
 
+a, a:active, a:focus, a:hover {
+  color: #000;
+  outline: none;
+  text-decoration: none;
+}
+
 /* Extra markup and styles for table-esque vertical and horizontal centering */
 .site-wrapper {
   display: table;
@@ -241,4 +247,4 @@ input {
 }
 .square:active {
   background-color: #85144b;
-}
+}

public/index.html

@@ -20,9 +20,9 @@
     <script src="app/sessionCollection.js"></script>
     <script src="app/gameCollection.js"></script>
     <script src="app/mainController.js"></script>
-    <link rel="stylesheet" href="css/scorekeep.css"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous"/>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/css/tether.css"/>
+    <link rel="stylesheet" href="css/scorekeep.css"/>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.js"></script>
     <script src="https://code.jquery.com/jquery-3.1.1.js" integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA=" crossorigin="anonymous"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js" integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK" crossorigin="anonymous"></script>
@@ -43,7 +43,7 @@
         <div class="cover-container">
           <div class="masthead clearfix">
             <div class="inner">
-              <h3 class="masthead-brand">Scorekeep</h3>
+              <h3 class="masthead-brand"><a href="#/">Scorekeep</a></h3>
               <nav class="nav nav-masthead">
                 <a class="nav-link" href='#/' onclick="showhide('instructions');return false;">Instructions</a>
                 <a class="nav-link" target="blank" href="https://aws.amazon.com/xray/">Powered by AWS X-Ray</a>