Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge pull request #204 from Proplex/master

Update manifest with correct versioning
Merge branch 'master' of https://github.com/Astonex/Antox
Fix a potential null pointer exception
Merge remote-tracking branch 'antox/master'
name written to settings on enter on welcome activity
clear notification on contact if their conversation is in the pane and the pane is closed
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