Merge branch 'master' into 1.x

Conflicts:
	coffee/docUtils.coffee
	coffee/docxgen.coffee

Author: edi9999

coffee/docUtils.coffee

@@ -32,9 +32,6 @@ DocUtils.defaultParser=(tag) ->
 		if tag=='.' then return scope else return scope[tag]
 	}
 
-DocUtils.nl2br = (str,is_xhtml) ->
-	(str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br>' + '$2');
-
 DocUtils.tags=
 	start:'{'
 	end:'}'
@@ -63,8 +60,7 @@ DocUtils.clone = (obj) ->
 
 DocUtils.xml2Str = (xmlNode) ->
 	a= new XMLSerializer()
-	content= a.serializeToString(xmlNode)
-	content.replace /\x20xmlns=""/g, '' #remove all added xmlns="" (these cause the file to be corrupt and was a problem for firefox)
+	a.serializeToString(xmlNode)
 
 DocUtils.Str2xml= (str,errorHandler) ->
 	parser=new DOMParser({errorHandler})