Merge branch 'ollieh-master'
Fixed chat timestamps
Merge branch 'master' of https://github.com/Astonex/Antox