Merge branch 'ollieh-master'
Added back button for chat
Merge branch 'master' of https://github.com/Astonex/Antox