Merge branch 'BrawlerUpdate' into 'master'

Brawler update

Brawler wound up nerfed indirectly by several of the recent changes, notably the stamina cost added to its former core defense.  This update addresses the stamina problem, gives more uses for the increased combo point income, and restores the weapon damage passive to the normal formula.

See merge request !411