Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/scripts/Custom/CMakeLists.txt