edx/edx-platform — pull request #5588 by muhhshoaib (2014-10-15 15:17:02+00:00)
Title: incorporated model changes as suggested by Jason.

@chrisndodge Kindly merge in the shopping-rewrite branch once test passes.

Thanks