grid refactoring
Merge branch 'master' of https://github.com/EdgeComputing/cats

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