Up to [c12548]

Up to [c12548] Compilefix
Merge branch 'master' of github.com:myraje/mangos-cata