Cleaned up chat active code
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'ollieh-master'