Some changes in some files (SEE COMMIT DIFF FOR DETAILS)
Merge branch 'master' of https://github.com/gauravmittal1995/ChatWithMe