Merge remote-tracking branch 'origin/develop' into develop

app/views/competitions/_header.html.erb

@@ -55,7 +55,7 @@
               <a href="<%= com_module.url %>" target="_blank"><%= com_module.name %></a>
             </li>
             <% else %>
-              <li class="<%= @md_content_header ? "active" : "" %>">
+              <li class="<%= @md_content_header && @md_content.competition_module_id == com_module.id ? "active" : "" %>">
                 <a href="<%= "#{md_content_competitions_path(:md_content_id => com_module.competition_module_md_content.try(:id))}" %>" target="_blank"><%= com_module.name %></a>
               </li>
             <% end %>