Merge branch 'master' into 4.3.4

Note: Will need extra Guild-Related commit to make it work again (Added some extra data beside the merge)

Conflicts:
	src/server/game/Battlefield/BattlefieldHandler.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SkillHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TaxiHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h

2 files changed, 36 insertions, 0 deletions

diff --git a/sql/updates/characters/2012_11_02_00_character_misc.sql b/sql/updates/characters/2012_11_02_00_character_misc.sql
new file mode 100644
index 00000000000..a7613944dc4
--- /dev/null
+++ b/sql/updates/characters/2012_11_02_00_character_misc.sql
@@ -0,0 +1,30 @@
+CREATE TABLE IF NOT EXISTS `guild_member_withdraw` (
+  `guid` int(10) unsigned NOT NULL,
+  `tab0` int(10) unsigned NOT NULL DEFAULT '0',
+  `tab1` int(10) unsigned NOT NULL DEFAULT '0',
+  `tab2` int(10) unsigned NOT NULL DEFAULT '0',
+  `tab3` int(10) unsigned NOT NULL DEFAULT '0',
+  `tab4` int(10) unsigned NOT NULL DEFAULT '0',
+  `tab5` int(10) unsigned NOT NULL DEFAULT '0',
+  `money` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild Member Daily Withdraws';
+
+ALTER TABLE `guild_member` DROP COLUMN `BankRemMoney`;
+ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab0`;
+ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab1`;
+ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab2`;
+ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab3`;
+ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab4`;
+ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab5`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeMoney`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab0`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab1`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab2`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab3`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab4`;
+ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab5`;
+
+DELETE FROM `worldstates` WHERE `entry`=20006;
+INSERT INTO `worldstates` (`entry`,`value`,`comment`) VALUES (20006,0, 'Guild daily reset');
+
diff --git a/sql/updates/world/2012_11_03_00_world_creature_loot_template.sql b/sql/updates/world/2012_11_03_00_world_creature_loot_template.sql
new file mode 100644
index 00000000000..0e5c39b796d
--- /dev/null
+++ b/sql/updates/world/2012_11_03_00_world_creature_loot_template.sql
@@ -0,0 +1,6 @@
+-- Readd loot to Stinky
+DELETE FROM `creature_loot_template` WHERE `entry` IN(37025,38064);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`)
+VALUES
+(37025,1,100,1,0,-35069,2),
+(38064,1,100,1,0,-35069,2);