"Merge Commit"
Include Content File in Cats Project
Merge branch 'master' of github.com:EdgeComputing/cats

Conflicts:
	Web/Cats.csproj
Borderless input on editable grid