Merge [SD2]

r1307 Add gossip for npc_tracy_proudwell. Patch by hoshie
r1308 Fixed one not initialized array.
r1309 Correct typo in folder name. - skip
r1310 Enable faction change and remove unitState at attackStart for script related to quest 1560

--HG--
branch : trunk

sql/FULL/world_scripts_full.sql

@@ -550,6 +550,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry
 UPDATE `creature_template` SET `ScriptName`='npc_aeranas' WHERE `entry`=17085;
 UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=181606;
 UPDATE `creature_template` SET `ScriptName`='npc_naladu' WHERE `entry`=19361;
+UPDATE `creature_template` SET `ScriptName`='npc_tracy_proudwell' WHERE `entry`=18266;
 
 /* HILLSBRAD FOOTHILLS */