Game Master can now end player's turn. Also, some combat bugfixes.
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma