BB: Fix conflict
Merge branch 'master' of https://github.com/UnitySocialFund/SocialFund

Conflicts:
	Web/Web.csproj