Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp

sql/updates/auth/2014_12_10_00_auth.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `rbac_default_permissions` 
+ADD COLUMN `realmId` INT(11) NOT NULL DEFAULT '-1' COMMENT 'Realm Id, -1 means all',
+DROP PRIMARY KEY, ADD PRIMARY KEY (`secId`, `permissionId`, `realmId`);

sql/updates/auth/2014_12_21_00_auth.sql

@@ -0,0 +1,9 @@
+-- Add rbac_permissions
+DELETE FROM `rbac_permissions` WHERE `id` = 51;
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
+(51, 'Allow trading between factions');
+
+-- Add rbac_linked_permissions
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 51;
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
+(194, 51);