Merge branch 'master' into Eran
Fix bug champions12-13 has 18 matches

Use Fixture_match_id instead if ID
Merge branch 'Eran'