fix html editor column width and merge
[roojs1] / resources_licence.txt
2010-04-06 www-datainitial import