Merge branch 'master' into develop
Fixed error saving armor and creating PDF for character with no armor.
Merge branch 'develop'