More Merc cleanup
Fix for string.h missing in water map
Merge remote-tracking branch 'remotes/EQEmu/water_map_v2'
Merge pull request #3 from cavedude00/master

merge