Add cart resources
Add cart resources to master
Fix merge conflict in user_spec, add Cart resources