Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en

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

diff --cc tmpl/skel.en
index 19377d91df6910a4473593357d580c9ff0466850,956e8954525dbf871267f2c462db87765f82e451..792da5a1880395570e87616956108e53fc36604e
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -16,7 -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="nav-about"><a href="/about">About / Help</a>
+ <li id="nav-contribute"><a href="/contribute">Contribute!</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>