Database:
Corrected Castle Zvhal Keep S npcs. added missing one.
Merge branch 'master' of https://github.com/DarkstarProject/darkstar into testing
CORE: Fixed grips unequipping on 2 handed weap change. TODO: Fix shields being unequipped when under sync/when using merits.