CIT-203 resolved
CATS-1026 Resolved
Connection String Change
Code refactored to reduce complexity
Finalizing fixes
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config