Fixed match time labels, added tests for match times and viper team saving
Moved some vars out into private config file
Merge pull request #20 from K4orta/event-timing

Fixed match time labels, added tests for match times and viper team savi...
Merge pull request #21 from K4orta/config-json

Moved some vars out into private config file
fixed merge conflict

Merge branch 'dev' of github.com:ign/ipl-robocop into dev

* 'dev' of github.com:ign/ipl-robocop:
  Moved some vars out into private config file

Conflicts:
	public/javascripts/app.js
	public/test/javascripts/test.js
Removed editor link from url helper, fixed view URL in publish menu
Merge pull request #23 from K4orta/rm-editorbase

Removed editor link from url helper, fixed view URL in publish menu
Changed static links to relative
Merge pull request #24 from K4orta/link-fixes

Changed static links to relative
changed links to work in Varnish
Merge pull request #25 from K4orta/static-links

changed links to work in Varnish
Namespaced static files to admin
Merge pull request #26 from K4orta/admin-namespace

Namespaced static files to admin
Corrected various paths to different resources
Commented out loading groups from the Content API dince we don't use them any more
Merge pull request #28 from K4orta/admin-path-fixes

Admin path fixes
Added a test to make sure best_of is being formatted correctly for matchup
Added some fixed sizing to match container elements to prevent overflow
Added additional spacing for single elim brackets
Merge pull request #30 from K4orta/matchup-test

Added a test to make sure best_of is being formatted correctly for match...