Merge branch 'master' into circleci

# Conflicts:
#	README.md

Author: g3force

README.md

@@ -1,7 +1,7 @@
-[![CircleCI](https://circleci.com/gh/g3force/ssl-game-controller/tree/master.svg?style=svg)](https://circleci.com/gh/g3force/ssl-game-controller/tree/master)
-[![Go Report Card](https://goreportcard.com/badge/github.com/g3force/ssl-game-controller?style=flat-square)](https://goreportcard.com/report/github.com/g3force/ssl-game-controller)
-[![Go Doc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](http://godoc.org/github.com/g3force/ssl-game-controller)
-[![Release](https://img.shields.io/github/release/golang-standards/project-layout.svg?style=flat-square)](https://github.com/g3force/ssl-game-controller/releases/latest)
+[![CircleCI](https://circleci.com/gh/RoboCup-SSL/ssl-game-controller/tree/master.svg?style=svg)](https://circleci.com/gh/RoboCup-SSL/ssl-game-controller/tree/master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/RoboCup-SSL/ssl-game-controller?style=flat-square)](https://goreportcard.com/report/github.com/RoboCup-SSL/ssl-game-controller)
+[![Go Doc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](https://godoc.org/github.com/RoboCup-SSL/ssl-game-controller/internal/app/controller)
+[![Release](https://img.shields.io/github/release/golang-standards/project-layout.svg?style=flat-square)](https://github.com/RoboCup-SSL/ssl-game-controller/releases/latest)
 
 # ssl-game-controller
 

cmd/ssl-game-controller/main.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/g3force/ssl-game-controller/internal/app/controller"
+	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/controller"
 	"github.com/gobuffalo/packr"
+	"log"
 	"net/http"
 )
 
@@ -14,6 +15,12 @@ func main() {
 	box := packr.NewBox("../../ui/dist")
 	http.Handle("/", http.FileServer(box))
 
+	if box.Has("index.html") {
+		log.Print("UI is available at http://localhost:8081")
+	} else {
+		log.Print("Backend-only version started. Run the UI separately or get a binary that has the UI included")
+	}
+
 	// serve the bidirectional web socket
 	http.HandleFunc("/ws", g.ApiServer.WsHandler)
 	http.ListenAndServe(":8081", nil)

internal/app/controller/controller.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"encoding/json"
-	"github.com/g3force/ssl-game-controller/pkg/timer"
+	"github.com/RoboCup-SSL/ssl-game-controller/pkg/timer"
 	"io"
 	"log"
 	"os"

internal/app/controller/publisher.go

@@ -29,7 +29,7 @@ func NewPublisher(address string) (publisher Publisher, err error) {
 	}
 
 	conn.SetReadBuffer(maxDatagramSize)
-	log.Println("Connected to", address)
+	log.Println("Publishing to", address)
 
 	publisher.conn = conn
 

release.sh

@@ -38,9 +38,9 @@
             }
         },
         watch: {
-            editValue: function (newTeamName) {
+            editValue: function (val) {
                 this.edit = false;
-                this.callback(this.editValue)
+                this.callback(val);
             }
         }
     }