UI conflict resolved
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config