Merge branch 'gh-pages' into 2013-10-10-git
Merge pull request #92 from fh-koeln/2013-10-10-git

Merge branch 'gh-pages' into 2013-10-10-git