Update files
Merge branch 'master' of https://github.com/zalito12/SkyFire_5xx

Conflicts:
	src/server/game/Entities/Player/Player.cpp