Updated to 18414

Signed-off-by: Sovak <Sovak007@gmail.com>
Merge branch 'master' of github.com:ProjectSkyfire/SkyFire_4xx

Conflicts:
	src/server/game/Guilds/Guild.cpp
	src/server/game/Server/Protocol/Opcodes.cpp