Merge pull request #1 from EQEmu/master

update
Fix crash issue in zone/hate_list.cpp
Fixed bug with loading failing on Guild bank areas
Merge pull request #235 from addtheice/guild_mgr_patch

Fixed bug with loading failing on Guild bank areas
Secrets: Identified OP_GuildPromote for RoF clients.
Secrets: Fixed promotion, demotion, transferring a leader and displaying of client ranks in the Rain of Fear client. The rain of fear client, as such, will only have 3 ranks like the other clients, but supports a theoretical 8 ranks later.
Secrets/Akkadius: Fixed an issue involving character name lookup in the new DB code.
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	changelog.txt
Changed #loc to report the same precision as /loc for Cartesians
Merge branch 'master' of https://github.com/EQEmu/Server
Oops.
Merge branch 'master' of https://github.com/EQEmu/Server
changelog.txt
Merge branch 'master' of https://github.com/EQEmu/Server

bc575b34f4a8464e4db2501d7a6a365d0.

Conflicts:
	changelog.txt
	zone/trading.cpp
Identified the routines needed to augment items in RoF. Currently, only Insert and Remove are supported. Swap and Destroy do not work due to missing functions related to the cursor.
Bot fixes for previous commit
Add #shownumhits workaround command to show numhits
Client timer issue fix
Fix iterator on mercstance crash bug
Merge pull request #244 from addtheice/merc_stance_fix

Fix iterator on mercstance crash bug
Fix logging macros

macros should be fully wrapped in do { ... } while(false) to prevent
any accidental coding issues (like else being eaten!!!)
Fix for losing 2nd and 3rd cursor items after zoning