Merge branch 'master' into newmc

diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index ea9926367890c8f4683f198e4e169b750b47ac03,57b4e50a5f2069bfcde733c0e10fe965ee7d1649..59ee37734ab42b8d1918fd07a05f293b58b5c530
--- 1/lib/Plack/App/Gruntmaster/HTML.pm
--- 2/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -71,7 -71,6 +71,7 @@@ sub _render 
  
  sub process_skel {
        my ($tree, %args) = @_;
 +      $tree->fid('logo')->replace_with(literal scalar read_file "mclogo.svg");
        $tree->content_handler(
                title   =>         $args{title},
                content => literal $args{meat});
@@@ -150,6 -149,11 +150,11 @@@ sub process_pb_entry 
                level     => ucfirst $args{level},
                author    =>         $args{author},
                owner     =>         $args{owner_name} || $args{owner});
+       if ($args{limits}) {
+               my @limits = (@{$args{limits}}, {format => 'Other', timeout => $args{timeout} });
+               @limits = map { sprintf '%s (%s)', @{$_}{qw/timeout format/} } @limits;
+               $tree->look_down(smap => 'timeout')->replace_content(join ', ', @limits);
+       }
        if ($args{contest_stop}) {
                $tree->fid('solution')->detach;
                $tree->fid('solution_modal')->detach;