DRYing controllers
Added active attribute to tournaments
Tests - broken
Merge branch 'beta'