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
Merge branch 'master' of https://github.com/Astonex/Antox
fix typo and move qr things to completed
Added friendrequest section in service
Merge branch 'master' of https://github.com/Astonex/Antox
Merge pull request #54 from dethstar/master

Fix typo and move qr things to completed
put start service back in the friendrequest callback
Remove tox:// from a scanned in QR key if it exists
Merge branch 'master' of https://github.com/Astonex/Antox
fixes: icon changes on slide
+different method called based on icon
Merge pull request #55 from dethstar/master

fixes: icon changes on slide
Now displays friend requests
Merge branch 'master' of https://github.com/Astonex/Antox