SIAllocation Controller-service integration
Merge branches 'master' and 'master' of https://github.com/EdgeComputing/cats

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