Move merge_updates_windows.bat to right folder and add Unix version
DB/Creature: Fix typos on dc8a7a6

**CENSORED** npcs with same name.
Really fixed build and warnings
Fix a Warning
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Merge pull request #2 from amsjunior1/master

pull