Initial About screen
Escape quote
Update friends list on callbacks
Update friends list on callbacks
Add Facebook and Bugs
Update README.md
Scale icons
Update README.md
Merge branch 'master' of https://github.com/Astonex/Antox

Conflicts:
	app/src/main/res/values/strings.xml
Fix git stupidity
Fix layout error/missing string
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge pull request #107 from dethstar/master

Add QR button to the action bar and removes the one from the activity layout
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox

Conflicts:
	app/src/main/res/layout/activity_add_friend.xml
	app/src/main/res/menu/add_friend.xml
Merge pull request #108 from Proplex/master

Add AboutActivity & more!
Center Antox Logo and resize update button for tablets
Merge branch 'master' of https://github.com/Astonex/Antox
Center image