Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/CMakeLists.txt
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
	src/server/scripts/World/achievement_scripts.cpp
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into mmaps