Fix SamplesController if Tournament doesn't exist. Allow method length of 20.
Merge branch 'master' into production