Merge branch 'master' into www-launch-rc2

html/index.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="Squatconf webSite">
-
+  <link rel="icon" href="favicon.ico" type="image/x-icon" />
   <link href="assets/css/bootstrap.css" rel="stylesheet">
   <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
   <link href="assets/css/squatconf.css" rel="stylesheet">