CATS-778 Summary Report For Free and Physical Stock Done.
Fixed some conflicts in hub model,cats project, and stock service to merge a pull
Fixed conflicts in cats.proj for pull merge