Fixed Bug #7199 and #7265

Credit to Xgear for the edit on Issue #7199.
http://hercules.ws/board/tracker/issue-7199-trade/

Credit to bgamez23 for the edit on Issue #007265.
http://hercules.ws/board/tracker/issue-7265-increase-agi-buffs-on-the-npc-bug/

Signed-off-by: ThinkIV <thinkivme@gmail.com>
Merge branch 'master' of https://github.com/ThinkIV/Hercules