Issue CIT-291 Fixed
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats
Fixed CIT-221 & CIT-275
Merge branch 'master' of https://github.com/EdgeComputing/cats

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