Merging together.
Reverting
Merge branch 'develop'
Merge branch 'random-spell-generator'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixed up Savant to match Dragon Compendium
Merge branch 'master' into develop