Create www for pages
Merge real pages
Refactor pages
Merge branch 'master' into gh-pages