Update Nomyx to work with ghc 7.8.
cosmetics
Merge branch 'master' of https://github.com/jkarni/Nomyx

Conflicts:
	Nomyx-Core/src/Nomyx/Core/Engine/Test.hs
	Nomyx-Language/src/Language/Nomyx/Expression.hs
	Nomyx-Web/Nomyx-Web.cabal
	Nomyx-Web/src/Nomyx/Web/Game.hs
Merge branch 'master' of github.com:cdupont/Nomyx