Update
Merge branch 'master' of https://github.com/MaggieSimpson/WebChat

Conflicts:
	WebChat/WebChat.v11.suo