Move the files in public to top directory
Merge branch 'master' into gh-pages