#FEC-895 #time 1h #comment updated text
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers/playerListCtrl.js