Merge branch 'dev' of github.com:liangliangyy/DjangoBlog into dev

templates/share_layout/base.html

@@ -31,7 +31,9 @@
           href='{% static 'blog/fonts/fonts.css' %}'
           type='text/css' media='all'/>
     <link rel="dns-prefetch" href="//cdn.mathjax.org"/>
-    <link rel="shortcut icon" href="favorite.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
+    <link rel="icon" href="/favicon.ico" type="image/x-icon"/>
+    <link rel="apple-touch-icon" href="/favicon.ico"/>
     {% compress css %}
 
         <link rel='stylesheet' id='twentytwelve-style-css' href='{% static 'blog/css/style.css' %}' type='text/css'