even more tests working
Merge branch 'preproc-lexer' of https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14 into preproc-lexer

Conflicts:
	integration-tests/neg_invalidMove4.io