Don't need that code right now.
Merge branch 'develop' into random-spell-generator
Some fixes to damage calc. Also fixed the conflicts in the spell list.