Merge branch 'master' into zykure/approved

Conflicts:
	xonstat/static/css/app.min.css

diff --cc xonstat/static/css/app.css
Simple merge

diff --cc xonstat/templates/game_info.mako
index 2d9bbfb47c6de8d0fc64e4d3844122f0035549cf,f61264514ed06f53008212ad852739b7bc66f925..e4981426faf492624f7722590840da45b666c65e
--- 1/xonstat/templates/game_info.mako
--- 2/xonstat/templates/game_info.mako
+++ b/xonstat/templates/game_info.mako
@@@ -46,29 -46,15 +46,30 @@@ Game Informatio
      </p>
      <span class="clear"></span>
    </div>
 +  % if teamscores:
 +  <div class="span3 teamscores">
 +    <table class="table table-condensed">
 +    <thead>
 +      <th>Team</th>
 +      <th>Score</th>
 +    </thead>
 +    <tbody>
 +    % for ts in teamscores:
 +      <tr class="${ts.team}"><td>${ts.team.capitalize()}</td><td>${ts.score}</td></tr>
 +    % endfor
 +    </tbody>
 +    </table>
 +  </div>
 +  % endif
  </div>
  
+ % for team in stats_by_team.keys():
  <div class="row">
    <div class="span12 game">
-     <h3>Scoreboard</h3>
-     ${scoreboard(game.game_type_cd, pgstats, show_elo, show_latency)}
+   ${scoreboard(game.game_type_cd, stats_by_team[team], show_elo, show_latency)}
    </div>
  </div>
+ % endfor
  
  % if len(captimes) > 0:
  <div class="row">