fix
Merge branch 'master' of https://github.com/Hallie611/SignalRSever

Conflicts:
	SignalRSever/Web/Player/PlayerDetail.aspx.cs
	SignalRSever/Web/Player/PlayerManagerPage.aspx.cs
	SignalRSever/Web/Question/QuestionHistory.aspx.cs