Merge pull request #23 from oceans15/tbaeg

collection of commits to fix merge issues and updates to the tournament module
upgraded ionic to latest version.  upgraded angular to 1.3
Merge pull request #34 from oceans15/ionic-upgrade

upgraded ionic to latest version.  upgraded angular to 1.3
Merge branch 'master' of https://github.com/oceans15/teleport into dev