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

Conflicts:
	js/controllers/LeagueController.js
fixed merge issue