Fixed Bug #7199
http://hercules.ws/board/tracker/issue-7199-trade/

Signed-off-by: ThinkIV <thinkivme@gmail.com>
Merge branch 'master' of https://github.com/ThinkIV/Hercules
Fixed Bug #7265
http://hercules.ws/board/tracker/issue-7265-increase-agi-buffs-on-the-npc-bug/

Signed-off-by: ThinkIV <thinkivme@gmail.com>