Sync
Merge branch 'master' of github.com:InFreefall/magic-spieler

Conflicts:
	src/Action.hs
	src/Cards/Common.hs
	src/Cards/M14.hs
	src/Cards/NinthEdition.hs
	src/Main.hs
	src/SnapServer.hs
	src/State/Operations.hs
	src/State/XML.hs