Merge branch 'master' into zykure/approved

Conflicts:
	xonstat/templates/player_game_index.mako

diff --cc xonstat/templates/main_index.mako
Simple merge

diff --cc xonstat/templates/player_game_index.mako
index dabef434500c393a13b06f059d5c06169f975c73,68c1a5ec33acd711fe962fa00b3391a6dff300b0..18eeeabb98a8151edd65f5e307866f722fe35a14
--- 1/xonstat/templates/player_game_index.mako
--- 2/xonstat/templates/player_game_index.mako
+++ b/xonstat/templates/player_game_index.mako
@@@ -44,8 -44,12 +44,12 @@@ Recent Game
    <div class="span12 tabbable">
      <ul class="nav nav-tabs">
        % for game in games_played:
-       <li>
 +      % if not game.game_type_cd in ['cq']:
 -
+       <li 
+       % if game.game_type_cd == game_type_cd or (game.game_type_cd == 'overall' and game_type_cd is None):
+       class="active"
+       % endif
+       >
        % if game.game_type_cd == 'overall':
        <a href="${request.route_url("player_game_index", player_id=player.player_id)}" alt="${game.game_type_cd}" title="" data-toggle="none">
        % else: