More Jedi Expertise Work

Lots of fixes and updates to Jedi expertise. Everything included in this commit should now work properly (or close to it), changing the player's stats correctly based off of expertise choices. Added a line in CombatService that factors in melee damage increases from expertise when determining raw damage.