change html encoding for tool convert
change tool convert
Merge branch 'mmukai-master'