home fix
Merge branch 'master' of https://github.com/IIIristraM/MercuryTest
Merge branch 'master' of https://github.com/IIIristraM/MercuryTest
fix callback bug + fix force client abort bug