repaired version
Merge branch 'master' of https://github.com/GatherTeam/gatherTeam

Conflicts:
	FootballProject/GatherTeam/GatherTeam.sln
	FootballProject/GatherTeam/GatherTeam.v12.suo
	FootballProject/GatherTeam/packages/repositories.config
	GatherTeamBackend_/GatherTeamBackendService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache