Merge branch 'master' into recap
battle summary at end of recap
Merge branch 'recap'