Added data models
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebChat.WebClient/.idea/workspace.xml