Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en

diff --cc js/90-themes.js
Simple merge

diff --cc lib/Plack/App/Gruntmaster/HTML.pm
index 090ca325e85dc3d486453b2bec0c332b999a5a98,bdd20c2d183439a6ef7635abc3bf38b075282e82..0a681161a51f91856bedde4e9b43d49177ef0a29
--- 1/lib/Plack/App/Gruntmaster/HTML.pm
--- 2/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -114,8 -114,9 +114,10 @@@ sub process_us 
  sub process_ct_entry {
        my ($tree, %args) = @_;
        $_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
 +      $tree->fid('editorial')->detach unless $args{finished};
        $tree->fid('links')->detach unless $args{started};
+       my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
+       $tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
        $tree->content_handler(
                start       => ftime   $args{start},
                stop        => ftime   $args{stop},

diff --cc tmpl/ct_entry.en
Simple merge

diff --cc tmpl/pb_entry.en
Simple merge

diff --cc tmpl/skel.en
index 16ebd70a30f2880d4f2cd7e1c0c299c6c4ca9785,19f3180712c4ec1d3f116d84d1873763e2f80418..19377d91df6910a4473593357d580c9ff0466850
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -16,8 -16,7 +16,8 @@@
  <li id="nav-log"><a href="/log/">Job log</a>
  <li id="nav-us"><a href="/us/">Users</a>
  <li id="nav-account"><a href="/account">Account</a>
- <li id="theme-selector" class="hidden"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
 +<li id="nav-about"><a href="/about">About / Help</a>
+ <li id="theme-selector" class="reqjs"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
  <ul class="dropdown-menu" role="menu">
  <li><a href="#" id="theme_slate">Gunmetal gray</a>
  <li><a href="#" id="theme_cyborg">Black</a>
@@@ -36,10 -35,9 +36,10 @@@
  
  <div id="content">Content goes here</div>
  
- <div id="login" class="hidden"><a href="/login">Log in</a></div>
+ <div id="login" class="reqjs"><a href="/login">Log in</a></div>
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
  
- <div id="tracker" class="hidden">
+ <div id="tracker" class="reqjs">
  <h3>Track user</h3>
  <div id="tracker_form">
  <div class="form-group">