Merge branch 'master' of plhardy/jm2l into master

jm2l/templates/layout.mako

@@ -60,7 +60,12 @@ ${helpers.uploader_js()}
           <div style="height:215px;background: url(/img/2017/logo_1.png) no-repeat scroll center transparent"></div>
             </a>
         </div>
-        % if request.user and request.user.vote_logo not in [1,2]:
+        <div class="item ${["","active"][request.user and request.user.vote_logo==3 or 0]}">
+            <a href="/">
+          <div style="height:215px;background: url(/img/2017/logo_2.png) no-repeat scroll center transparent"></div>
+            </a>
+        </div>
+        % if request.user and request.user.vote_logo not in [1,2,3]:
         <div class="item active">
             <div class="align-center">
                 <H1>JM2L 2017</H1>