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

Conflicts:
	sql/updates/world/2014_07_13_01_world_misc.sql
	src/server/game/Battlefield/Zones/BattlefieldWG.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Spells/spell_generic.cpp