update

Time stamp for chat fixed
Merge branch 'master' of https://github.com/teamhusky/Server-client