Changes made by Miroslav Vitanov (mvvitanov@gmail.com).
Merge branch 'master' of https://github.com/ivanstef/Chatapp123123.git