added shopping cart models TODO: add submit option to set shopping cart to 'submitted'
gemlock conflict fix