Merge pull request #1 from codescrapper/master

Changes on upstream
chat screen
Merge pull request #3 from daiictian/master

Registration