Core/Quests: Added stuff missing in previous commit
Build fix
DB/Misc: Fix a couple errors I introduced.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb