New pages
Merged master
Merge branch 'master' into gh-pages
Fixed URLs one last time