be more bulletproof when setting cirterions for foreign key values
Merge branch 'master' of github.com:diefenbach/django-lfs
handle situation where multiple carts are created
Merge remote-tracking branch 'upstream/master'