remove redundant casting
call+video icons
show the barcode on the action bar
Add QR button to the action bar and removes the one from the activity layout
Update README.md
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

Conflicts:
	app/src/main/res/layout/activity_add_friend.xml
	app/src/main/res/menu/add_friend.xml