Merge branch 'master' of github.com:IGZJavierPerez/social-scoreboard

Conflicts:
	Gruntfile.js