Activate presentations 06 and 07
Merge branch 'master' into gh-pages