DM combat handling via toolbar
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma