Derp with a string
Merge pull request #11 from Ansa89/master

Sync with main project
Merge pull request #12 from Astonex/master

Sync with main project
Merge pull request #13 from Ansa89/master

Sync with main project
Update README.md

Update Android Studio version
Merge branch 'master' of https://github.com/Astonex/Antox
Fix string grammar; re-arrange settings
Update AS Version
update Spanish translation
remove acento
Merge branch 'Proplex-master'
Merge branch 'dethstar-master'
Properly load and set the user's profile details when starting the app
Stop users adding friends when not connected to the Tox network
Add a connection change receiver.
Merge remote-tracking branch 'upstream/master'
Remove a couple menu actions from the chat view
Merge pull request #14 from Astonex/master

Sync with main project
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from Ansa89/master

Sync with main project