nested if
Merge pull request #158 from dethstar/master

moves QR code back to external so that it can be shared
Properly fix UI not updating on friend request
Italian translation: update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/im/tox/antox/MainActivity.java
Merge pull request #159 from Ansa89/patch-1

Italian translation: update
Speed up UI a little deleting friend requests
Merge remote-tracking branch 'antox/master'
Change polling rate
UI should update quicker
Merge remote-tracking branch 'upstream/master'
Don't send notification when looking at the friends list
Don't show timestamp in left pane if no messages yet
Merge remote-tracking branch 'upstream/master'
added permisions for vibration
Merge pull request #165 from strider29/master

vibration permission
scroll the chat messages up
Moving doTox() to a seperate service
Merge pull request #166 from strider29/master

scroll the chat messages up when the keyboard is opened
adds intent to get audio/image/video/files when the send file button is pressed
+receive the data on main_activity, figure out the selected file and its type