Merge branch 'dev'
Teams and Matchups weren't loading in the cms because these endpoints were using the deprecated Query class.  Converted these to use the new Criteria Translator.
Merge pull request #84 from akashpatel/event-not-loading-fix

Teams and Matchups weren't loading in the cms because these endpoints we...
Merge branch 'dev'
Merge branch 'master' of github.com:akashpatel/ipl-viper