Manage demo through gh-pages now
Merge branch 'master' into gh-pages