Merge branch 'master' into page-placeholders

diff --combined templates/index.html
index 1eae0dbd02876c92d05f83d9c9713b8ee45513b3,68e068cee3213ac1eff7d1fe180e0fe067fcebf5..190a2893f44b3ffea351082c6db0d1412c5eb1c2
--- 1/templates/index.html
--- 2/templates/index.html
+++ b/templates/index.html
@@@ -2,19 -2,19 +2,19 @@@
  {% set title = config.name %}
  {% block content %}
  <div class="jumbotron">
-     <h2 class="child">Welcome to freenode—supporting free and open source communities since 1998</h2>
+     <h2 class="child">Welcome to freenode&thinsp;—&thinsp;supporting free and open source communities since 1998</h2>
      <div class="box-container">
 -        <a class="box" href="about">
 +        <a class="box" href="href="{{ url_for("pages/vision") }}"">
              <i class="fa fa-comment fa-4x"></i>
              <div>Chat</div>
          </a>
 -        <a class="box" href="contribute">
 +        <a class="box" href="href="{{ url_for("pages/soon") }}"">
              <i class="fa fa-users fa-4x"></i>
              <div>Register a group</div>
          </a>
          <a class="box" href="help">
              <i class="fa fa-question fa-4x"></i>
 -            <div>FAQ</div>
 +            <div href="{{ url_for("faq") }}">FAQ</div>
          </a>
      </div>
  </div>