Merge branch 'ajturner'
Merge branch 'ajturner'
Merge branch 'ajturner'

* ajturner:
  Shopping Cart enhancements: 	- Demo jspx file to show cart manipulation of cart contents 	- modifying contents works 	- setting qty to zero (0) removes item from cart 	- single "Update Cart" button for entire cart (user can make multiple changes and submit them all at once) 	- Multiple items supported for shopping cart (update/delete via quantity==0 check, loading in items)
  Cart updates: 	- cart now updates pricing on each request to the shopping cart (do we want listeners to do this? If so how would we check the database?) (should we notify the user when a price has changed?) 	- really crappy HTML/JSP basically showing that if you manually poke in an item, it shows up in the shopping cart and remains there for future hits
Merge branch 'ajturner'

* ajturner:
  ShoppingCart enhancements: 	- Checkout exists, needs tax/shipping/order id generation done properly (uses dummy values for now) 	- Checkout needs to generate PO xml file and store it somewhere (exact location undecided)
Shopping Cart checkout 90% complete (missing date annotation and a mechanism to allow the user to bookmark the resulting PO, needs some prettying up)
Merge branch 'master' into ajturner

* master:
  Shopping Cart checkout 90% complete (missing date annotation and a mechanism to allow the user to bookmark the resulting PO, needs some prettying up)