Merge branch 'master' into Eran
Group Matches by competition
Merge branch 'Eran'