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

Conflicts:
	.travis.yml