Starting implementation of the generic combat system
Merge remote-tracking branch 'origin/master'