Client
Merge branch 'fiz' of https://github.com/appeljus/Messenger.git into fiz