merge koniu/recoll-webui