Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	js/controllers/TeamController.js
	partials/match.html
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	js/controllers/TeamController.js
	partials/match.html