goal & end
Merge branch 'master' into game-ctrl

Conflicts:
	src/main/webapp/js/controllers.js
score goals and end game
Merge pull request #5 from almorelle/game-ctrl

Game controller (score goals and end match)