merge de campeonato
Adapted merge to work with social integration
Adapted ServerEvents onnotice