Update gh-pages

- Finished merge from working_copy