*
Merge branch 'master' of https://github.com/DimaHyts/Chat

Conflicts:
	Chat2.0.v11.suo
*
Merge branch 'master' of https://github.com/DimaHyts/Chat
*