Merge branch 'master' into web
Fix thumbs on virtualfolder
Add web folder with web.css file