Merge pull request #17 from Roll20/master

update
Renamed NPC traits

CT and Defenses
Merge pull request #484 from alicia86/master

Fixed PC/NPC conflicts