no message
Merge branch 'master' of https://github.com/pmpu/serverhouse

Conflicts:
	app/server/serverhouse_web/serverhouse_web/App_Start/AuthConfig.cs