lu
Merge branch 'master' of https://github.com/Shadowsniko/TrinityCore

Conflicts:
	cmake/genrev.cmake