fixed cabal dependencies
Merge branch 'intertarget-code' of github.com:SWP-Ubau-SoSe2014-Haskell/SWPSoSe14 into intertarget-code