Merge branch 'master' into master

diff --cc templates/pages/sponsors.html
index c50470c760aba692b2dd44aa888d9f8ab3a066a6,52a77472c412648d759ab4c8eee4a751c3c6af03..9b312d5e79554d2b978895cb31b1a63026223763
--- 1/templates/pages/sponsors.html
--- 2/templates/pages/sponsors.html
+++ b/templates/pages/sponsors.html
@@@ -31,8 -32,7 +32,9 @@@
                  <div class="col-md-6 {% if loop.revindex0 == 0 and loop.length
                           is not divisibleby 2 %} col-md-offset-3 {% endif %}">
                                        <!-- Diamond -->
 -                                              <a href="{{p.link}}" target="_blank"><img src="{{media("images/" + p.largelogo)}}" alt="{{p.name}}"></a>
 +                                              <h3>Diamond</h3>
 +                                              <a href="{{p.link}}" target="_blank"><img id="sponsors" src="{{media("images/" + p.largelogo)}}" alt="{{p.name}}"></a>
++      
                                                <div class="caption">
                                                        <small><em>{{p.intro}}</em></small>
                                                </div>