Merge branch 'gh-pages' into 2013-10-10-html-advanced-14
Merge pull request #93 from fh-koeln/2013-10-10-html-advanced-14

Merge branch 'gh-pages' into 2013-10-10-html-advanced-14