Update htdocs.qrc
merge