fixed cabal file
Merge remote-tracking branch 'origin/NewEditor' into highlighter

Conflicts:
	SWPSoSe14.cabal
	src/RailEditor/KeyHandler.hs
	src/RailEditor/TextArea.hs
	src/RailEditor/TextAreaContent.hs
Changed function definitions in TextArea.hs.
Added a prototype to build for testing highlighting
Merge remote-tracking branch 'origin/preproc-lexer' into highlighter
Merge branch 'highlighter' into alternative_editor

Conflicts:
	src/RailEditor/TextArea.hs