Update Dynamics - KinBall
Merge branch 'master' of https://github.com/elisapp/elis-live

Conflicts:
	app/controllers/match/scoreboard.js
	app/models/clock.js
	app/styles/app.scss
	app/templates/match/scoreboards/kinball.hbs