Revert "Merge branch 'master' of https://github.com/RRZE-Webteam/Design-RRZE-Techfak2013"

This reverts commit 9fb982112f7be7b0c04d902175825db9348f88fb, reversing
changes made to 394209becdef3357db3eb655b3db15923fcc0a6a.