Merge branch 'master' into mindcoding

Conflicts:
	tmpl/header.en

diff --cc js/90-custom.js
index 8b1435d05301d20714ef3f00ea74f6b7384701ef,750aaa101822763bfb7171b430d375e4089640f0..d847fc12092dc8dcd444e7929088dc02993e59e9
--- 1/js/90-custom.js
--- 2/js/90-custom.js
+++ b/js/90-custom.js
@@@ -1,17 -1,8 +1,17 @@@
  (function(){
        'use strict';
        function set_style(name){
-               $('#stylesheet').attr("href", "/css/" + name);
+               $('#stylesheet').attr("href", "/css/" + name + ".css");
                localStorage.setItem("theme", name);
 +              if(name == 'slate' || name == 'cyborg')
 +                      $('.logo').addClass('logo-dark');
 +              else
 +                      $('.logo').removeClass('logo-dark');
 +      }
 +
 +      var theme = localStorage.getItem("theme");
 +      if(theme) {
 +              set_style(theme);
        }
  
        $( document ).ready(function() {

diff --cc tmpl/header.en
index 2238a38856249e1e2f6dd70a7092020e84bf3335,c4f51f6c9c07e99040daf75ed209e23f28525438..72c4da3dedc95ec2560e0b35459c4b7c5d34dbe7
--- 1/tmpl/header.en
--- 2/tmpl/header.en
+++ b/tmpl/header.en
@@@ -3,9 -3,8 +3,9 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
- <link rel="stylesheet" href="/css/cosmo" id="stylesheet">
- <script src="/js" type="text/javascript"></script>
 +<link rel="shortcut icon" href="/static/favicon.png">
+ <link rel="stylesheet" href="/css/cyborg.css" id="stylesheet">
+ <script src="/js.js" type="text/javascript"></script>
  
  <nav class="navbar navbar-default navbar-static-top" role="navigation">
  <div class="container-fluid">