Diverse
Merge remote-tracking branch 'origin/GameLoop-Continue' into GameLoop-Continue

Conflicts:
	src/DeckParser.cc
	test/DeckParser_test.cc