Merge branch 'master' of github.com:webnotes/erpnext into edge

website/templates/js/blog.js

@@ -64,7 +64,9 @@ var blog = {
 				b.comment_text = '1 comment.'
 			} else {
 				b.comment_text = b.comments + ' comments.'
-			} 
+			}
+			
+			b.page_name = encodeURIComponent(b.page_name);
 			
 			$(repl('<div class="row">\
 					<div class="span1">\

website/templates/js/blog_page.js

@@ -36,7 +36,7 @@ $(document).ready(function() {
 			comment_by: $("[name='comment_by']").val(),
 			comment: $("[name='comment']").val(),
 			cmd: "website.helpers.blog.add_comment",
-			comment_doctype: "Blog",
+			comment_doctype: "Blog Post",
 			comment_docname: "{{ name }}",
 			page_name: "{{ page_name }}",
 			_type: "POST"