Merge branch 'ollieh-master'
Merge branch 'ollieh-master'
Merge branch 'ollieh-master'
Merge branch 'ollieh-master'
Merge branch 'master' of https://github.com/Astonex/Antox
Upping version
Change IntentService to Service
Upping verison
Fixed updating of online status, the most recent message displayed be an actual message rather than a file transfer or an action message