Skill merge.

Note: many skils are currently missing
YATF (Yet Another Typo Fix)
NPC merge