fixes initial willpower and its calculation base to five
Merge remote-tracking branch 'origin/master'