公聊页面
Merge branch 'master' of github.com:ContestHunter/ContestHunter

Conflicts:
	ContestHunter/ContestHunter.csproj
	ContestHunter/Controllers/ChatController.cs