Merge branch 'master' of git://github.com/TrinityCore/TrinityCore into teste2

Conflicts fixed:
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
unused