Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en

diff --cc lib/Plack/App/Gruntmaster/HTML.pm
Simple merge

diff --cc tmpl/pb_entry.en
Simple merge

diff --cc tmpl/skel.en
index 3b363b906826dc1612f991450f3fdbe87859eb58,6ae836aea13a969de2a515d7c646938cb78b8867..364234e7a4c6abf0c6823b4771d2e8011f95bf21
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -18,8 -17,7 +18,8 @@@
  <li id="nav-ct"><a href="/ct/">Contests</a>
  <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="nav-account" static="no"><a href="/account">Account</a>
 +<li id="nav-about"><a href="/about">About / Help</a>
  <li id="nav-contribute"><a href="/contribute">Contribute!</a>
  
  </ul>
@@@ -27,15 -25,15 +27,17 @@@
  </nav>
  
  <div class="container-fluid">
 +<div id="logo"></div>
  
  <h1 id="title">TITLE</h1>
 -<div id="static" class="alert alert-info" static="yes">This is a static version of Gruntmaster 6000.</div>
++<div id="static" class="alert alert-info" static="yes">This is a static version of MindCoding, useful when the <a href="https://mindcoding.ro/">regular version</a> is overloaded.</div>
+ 
  <div id="result"></div>
  
  <div id="content">Content goes here</div>
  
- <div id="login" class="reqjs"><a href="#">Log in</a></div>
+ <div id="login" class="reqjs" static="no"><a href="#">Log in</a></div>
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
  
  <div id="theme-selector" class="reqjs">
  Themes: