Added link to pages
Add toolbar
Merge branch 'master' into gh-pages
compile