Favicon for website
Started work on comments to be embedded in blog page
diff --git a/erpnext/website/templates/base.html b/erpnext/website/templates/base.html
index cd64139..8639a8f 100644
--- a/erpnext/website/templates/base.html
+++ b/erpnext/website/templates/base.html
@@ -3,14 +3,21 @@
 	<meta charset="utf-8">
 	<title>{% block title %}{% endblock %}</title>
 	<meta name="generator" content="wnframework">
-	<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
-	<link rel="icon" href="images/favicon.ico" type="image/x-icon">
 	<script type="text/javascript" src="js/lib/jquery/jquery.min.js"></script>
 	<script type="text/javascript" src="js/all-web.js"></script>
 	<script type="text/javascript" src="js/wn-web.js"></script>
 	<link type="text/css" rel="stylesheet" href="css/all-web.css">
 	<link type="text/css" rel="stylesheet" href="css/wn-web.css">
 	
+	{% if favicon %}
+	<link rel="shortcut icon" href="files/{{ favicon }}" type="image/x-icon">
+	<link rel="icon" href="files/{{ favicon }}" type="image/x-icon">
+	{% else %}
+	<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
+	<link rel="icon" href="images/favicon.ico" type="image/x-icon">
+	{% endif %}
+	
+	
 	{% block header %}
 	{% endblock %}
 </head>