added category relationship test and integration with items and order.

jesus fuck
fix merge conflicts, still has rspec errors
fix merge issues and fix order spec