Merge pull request #41 from Ansa89/master

Sync with main project
Italian translation: update

Sync'ed with Astonex/Antox@886a46d6d81d73f97a5a4279ac7e9650e3345f2d
Fixed clicking notifications not taking you to the chat
Merge branch 'ollieh-master'
translate some strings
Fixed chat timestamps
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'Ansa89-italian-translation'
Merge branch 'master' of https://github.com/Unpublished/Antox into Unpublished-master
Merge branch 'Unpublished-master'
Redo PrettyTimestamp.java
Workaround for Time.set(long) not working as advertised
Merge branch 'ollieh-master'
removed vibrate and ringtone prefs
Fixed crash when typing to friend who has not accepted friend request
Merge branch 'ollieh-master'
Use byte array decoding instead of file decoding
Stop users adding themselves
Display message for adding your own ID
Bug causing two instances of tox