Complete revamp
Merge remote-tracking branch 'origin/compilerErrors' into Create-test-system

Conflicts:
	include/CardContainerManager.h
	include/Player.h