SI Allocation at FDP level
SI-allocation at fdp level
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Cats.csproj
	Web/Web.config
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Cats.csproj
Backup before big change
SI-PC allocation at the FDP Level-Server side integration for read.
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Cats.csproj
	Web/Web.config
Merge branch 'master' of https://github.com/EdgeComputing/cats