Integration tests renamed and merged into passing
Merge branch 'master' of https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14
created new negative test for integration. renamed tests, etc.