Merge branch 'release/ed'
Fix incorrect totalling of negative traits on character creation screen.
Fix limit on negative traits.