* Fix for NPC missing skins.
* Added CLASS_MERC and replaced bad use of CLASS_STORMTROOPER in npc files.