Merge branch 'master' of https://github.com/Astonex/Antox
Merge pull request #146 from cuttingedge03/master

fixed action bar theme issue below api 11 and added ScrollView in AddfriendActivity
Socket timeout increased to 10s
Merge remote-tracking branch 'upstream/master'
Merge pull request #172 from strider29/master

socket timeout increased to 10s for downloading node details
Fixed delivery receipt bug
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Pseudo offline messaging / sending of unsent messages when user comes online. Currently tries to send all unsent messages rather than just for that specific user, could do with improving, but hey, it works.
changed so it only updates sent messages with the id
Merge branch 'master' of https://github.com/Astonex/Antox
Nobby no mates
Merge branch 'master' of https://github.com/Astonex/Antox
This triggers me
Merge pull request #175 from Proplex/master

This triggers me
Fixed the layout cutting out timestamp and unread count.

Somehow, on my S2 the timestamp and unread message count were "outside" the left pane, and not visible.
Merge pull request #176 from martinhath/master

Fixed the layout cutting out timestamp and unread count.
Handle NumberFormatException in parsing the friendKey.
Add a space on the actions on dialog between the word "on" and the user's name.
Merge pull request #177 from DevPump/master

Add a space on the actions on dialog between the word "on" and the user's name