Merge branch '3.3.5' into 4.3.4

Conflicts:
	.gitattributes
	dep/PackageList.txt
	sql/base/characters_database.sql
	sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
	sql/updates/world/2015_07_01_03_world_335.sql
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp

src/server/game/Entities/GameObject/GameObject.cpp

@@ -1797,6 +1797,9 @@ void GameObject::Use(Unit* user)
         return;
     }
 
+    if (Player* player = user->ToPlayer())
+        sOutdoorPvPMgr->HandleCustomSpell(player, spellId, this);
+
     if (spellCaster)
         spellCaster->CastSpell(user, spellInfo, triggered);
     else
@@ -2408,7 +2411,7 @@ void GameObject::UpdateModelPosition()
     if (GetMap()->ContainsGameObjectModel(*m_model))
     {
         GetMap()->RemoveGameObjectModel(*m_model);
-        m_model->Relocate(*this);
+        m_model->UpdatePosition();
         GetMap()->InsertGameObjectModel(*m_model);
     }
 }