Nearly everything to handle receiving friend requests, except the service isn't starting or at least not broadcasting.
Merge pull request #49 from Proplex/master

Separate Settings into Profile and Settings, update Welcome screen
Update README.md
Merge master branch
+ qrCodeGEneration in profile
+ core.jar to libs
+ QR code in im.tox.qr package
Connect to bootstrap after the callbacks have been registered
Merge remote-tracking branch 'antox/master'
Merge pull request #50 from dethstar/master

QR generation + libs + Android Studio changed some formatting
+mkdirs
+share with string in strings.xml
Capitalization
Merge pull request #51 from dethstar/master

Fixes: creates Antox folder if it doesn't exists
Fixed one nasty, nasty bug. Infinite loop in the tox service that was to call do_tox was blocking other service calls from working.
Merged
Merge pull request #52 from ollieh/master

Friend request receiving basically working, redid how do_tox is called.
Connect to bootstrap after the callbacks have been registered
QR reader with barcode reader app
+read qr button on addfriendactivity
+qr string
+qr intent classes
Merge remote-tracking branch 'upstream/master'
Better way to connect to bootstrap
Remove logging
Merge remote-tracking branch 'upstream/master'
Merge pull request #53 from dethstar/master

QR reader with barcode reader app