Resolve merge conflict
BugFix: AdminMatchesCtrl updated to match new resource handling
Merge pull request #61 from FCStrike/master

BugFix: AdminMatchesCtrl updated to match new resource handling