Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/howto-cards!47

404.html

@@ -25,5 +25,5 @@ layout: default
   <p><i>Please note: Some cards are only available from within the university network. Please
           reload the page when connected using <a href="https://vpn.uni.lu"><strong>VPN</strong></a>
          (from outside the university network)
-         or when connected to the <strong>eduroam</strong> network.</i></p>
+         or when connected to the <strong>eduroam</strong> network while at the university.</i></p>
 </div>