04: Fix example htmlentities
Activate presentations 04 & 05
Merge branch 'master' into gh-pages