Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp

src/server/scripts/Commands/cs_debug.cpp

@@ -300,7 +300,7 @@ public:
                 else if (commentToken[1] == '/')
                 {
                     std::string str;
-                    getline(ifs, str);
+                    std::getline(ifs, str);
                     continue;
                 }
                 // regular data