Added attackdelay to #npcedit

Also changelog!
Fix copy paste error
match GetAttackSpeedTimer haste with the recent change to SetAttackSpeed
Merge branch 'master' of https://github.com/EQEmu/Server
removed some recent changelog comments that aren't committed to our code.

added comments about merchantprobability.