Combat page first pass

Essence motes, attack, damage moved to Combat page
Combos, armor added
Verbose charms, weapons added
Need to remove weapons from statistics page, replace charms on
statistics page with Merits & Flaws
Need to move Dodge DV and Mental DVs to Combat page