[TW368] - Remove stuff...
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore

Conflicts:
	src/server/scripts/Custom/CMakeLists.txt
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h