Scripts/Commands: Fix warnings vs2014 ctp (no support)
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Core/Creature: Fix problems with neutral innkeepers
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Core/Battlefield: move complex methods from BattlefieldWG.h to BattlefieldWG.cpp
Core/Battleground: moved some arena related code into a generic arena class
* fixed typo in random bg selection, that causes no bg is created if only one bg is enabled
* fixed swapped worldstates in Ring of Valor
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp