Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server

Conflicts:
	onyx/include/team/exercice.php
	onyx/tpl/bootstrap/teams/exercice.tpl

onyx/tpl/bootstrap/teams/exercice.tpl

@@ -36,4 +36,20 @@
     </form>
 </ul>
 
+<ol>
+{foreach from=$top10 item=team key=pos}
+  <li>{$team->get_name()} <small>({$team->get_pts()})</small></li>
+{/foreach}
+</ol>
+
+<div id="my_team">
+  {$my_team->get_rank(10)}/{Team::get_nbTeams()}
+</div>
+
+<div id="theme_list">
+{foreach from=$themes item=theme key=k}
+  <strong>{$theme->get_name()}</strong><br>
+  {$my_team->get_nbResExercisesByTheme($theme->get_id())}/{$theme->get_nbExercices()}<br>
+{/foreach}
+</div>
 {/block}