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

Conflicts:
	Web/Areas/Transaction/Controllers/TransactionTestController.cs
	Web/Cats.csproj
	Web/Views/_ViewStart.cshtml