Combat participants work for DM and Player, combat handling is done.
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma

Conflicts:
	ScarletGamma/src/states/CommonState.cpp