Merge pull request #13 from cavedude00/master

merge from cavedude00:master
Merge pull request #14 from cavedude00/master

merge from cavedude00:master
Merge pull request #15 from cavedude00/master

merge from cavedude00:master
Merge pull request #16 from cavedude00/master

merge from cavedude00:master
Merge pull request #17 from cavedude00/master

merge from cavedude00:master
Merge pull request #18 from cavedude00/master

merge from cavedude00:master
Merge pull request #19 from cavedude00/master

merge from cavedude00:master
Merge pull request #20 from cavedude00/master

merge from cavedude00:master
Merge pull request #21 from cavedude00/master

merge from cavedude00:master
Merge pull request #22 from cavedude00/master

merge from cavedude00:master
Merge pull request #23 from regneq/master

fix for temp merchant lists not loading correctly
Merge pull request #24 from regneq/master

fixed for item clicky.
Allow npc_types field 'special_abilities' to be set as null in database.
Changed due to issues when trying to copy npcs or remove abilities from
the field directly in the dataabase.
Fix so NPC don't ghost when casting spells from scripts while moving.
Fix for bug with Discipline recast timers preventing them from
working properly if you used a focus effect to reduce recast time
to zero.

(Specifically the recast timer failed to reset in the situation
where you had already used the disc WIHTOUT the focus applied, then applied
the focus and tried to have it reduced).
Small update to prior commit.
Merge pull request #25 from regneq/master

merge from cavedude00:master
Optional SQL to add AA Quick Draw
moved CheckIncreaseSKill so picklock can only be increased on doors you have skill to open and only when the door is opened.
Fix for not loading some account data on character load