Dox2Bck
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion

Conflicts:
	celeryworker/newdocx4j/ConvertInXHTMLFile.class
	celeryworker/newdocx4j/ConvertInXHTMLFile.java
	celeryworker/newdocx4j/DocxToXhtmlAndBack.class
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion
error-fixes