Merge branch 'ollieh-master'
Change recent fragment to proper white
Cleaned up chat active code
Merge branch 'master' of https://github.com/Astonex/Antox