Fix a potential null pointer exception
Merge remote-tracking branch 'antox/master'
Merge pull request #205 from dethstar/master

update chat on pane closed
Removing options not implemented yet to avoid confusion
Merge remote-tracking branch 'antox/master'
Update README.md
I missed a word
Italian translation: sync'ed with ec696b05d7edf2ca6ffa3b6b3de3d7d9a9c5fdae
Merge pull request #207 from sudden6/master

I missed a word
Merge pull request #208 from Ansa89/patch-1

Italian translation: sync'ed with ec696b05d7edf2ca6ffa3b6b3de3d7d9a9c5fdae
Will now properly udpate user status
Maybe fix disconnections
option to delete all chat
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/im/tox/antox/fragments/ContactsFragment.java
missing statement
Merge pull request #209 from strider29/master

option to delete chat on long press
Will now say in logcat when not connected to tox network
Italian translation: update

Sync'ed with 3d569d8d6ad564602afd1753aae4802250c668fa
Merge pull request #212 from Ansa89/patch-1

Italian translation: update
Update README.md

Update Android Studio version