Merge pull request #47 from stevenklar/develop

Took tournament infobox logic out of view and fix bug where the default ...