Qunatity validation on project code assignment
Merge branch 'master' of https://github.com/EdgeComputing/cats
cats project conflict resolve
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Cats.sln
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Cats.sln
Merge branch 'master' of https://github.com/EdgeComputing/cats