test/demo -> demo/test
Merge branch 'master' into gh-pages