Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
i say so Merge branch 'master' of https://github.com/Astonex/Antox
updates readme
updates friend list after adding them from the addFriendActivity
update the spanish translation
use a constant instead of a literal number for the request code
Merge pull request #123 from ollieh/master

Fixed messages moving to the right in the messages listview as the list items were recycled
Merge pull request #121 from dethstar/master

updates friend list after adding them from the addFriendActivity
Updated jToxcore, fixes truncation of strings
Merge branch 'master' of https://github.com/Astonex/Antox