Added some stuff.
Merge branch 'NewEditor' of github.com:SWP-Ubau-SoSe2014-Haskell/SWPSoSe14 into NewEditor
Fix some performance problems.
Merge branch 'NewEditor' of github.com:SWP-Ubau-SoSe2014-Haskell/SWPSoSe14 into NewEditor