Cleanup
Moves spell classes to Hero_Spells
Moves favoring trait type for spells into spell template
Fixes integrationtests