updated css and links on demo page
Merge branch 'master' into gh-pages