Mixtrade med forward declarations, bleh.
Merge remote-tracking branch 'origin/Create-test-system' into Create-test-system

Conflicts:
	include/Effects/Draw.h
	test/Card_test.cc