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

Conflicts:
	.travis.yml
	src/server/game/Entities/Creature/Creature.h
Merge branch 'master' of github.com:TrueWoW/TrinityCore
DB/Misc: Some additions to https://github.com/TrinityCore/TrinityCore/commit/137c8a7de9beaa90441c5aa38e14ad0b09bebffe

Some additions to https://github.com/TrinityCore/TrinityCore/commit/137c8a7de9beaa90441c5aa38e14ad0b09bebffe

* Add a missing npc_text where gossip menu had already existed in db with this text and core script sent this text as gossip but text was not in db
* Correct option id for a option.
SQL: Fix typo.

Fix typo in 587d87d2ccc888b0a881be4bfaab150422edaec8.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	.travis.yml