finish workshop 07 and updates workshop list
Merge branch 'master' into gh-pages
update html