Changes needed by Intermediate
Merge branch 'gui' of github.com:SWP-Ubau-SoSe2014-Haskell/SWPSoSe14 into gui