Merge css-demo into web-demo