Merge branch 'master' into ajturner
Some cart related changes
Merge commit '3b67f8a4baa42df863dd7b196629210bf141ba12' into ajturner

Conflicts:
	src/ctrl/CartServlet.java
	src/ctrl/FrontServlet.java
Removed duplicate CartServlet file, retouched FrontServlet.
Merge branch 'ajturner'
Fixed cart settings, cleaned up duplicate.
Merge branch 'ajturner'
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

Todo (Cart):
	- Cart view should remove items and Servlet needs to test that removal works ok (remove one item, remove all items)
	- Way to change quantity (and have view update when this happens, probably just submit a cart update form and then reload the page?)
	- Make an actual cart view...
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)

Todo:
	- Support removing item immediately from cart (be careful of indices then! Maybe AJAX request here?)
	- Support sales on items when you have specific items in cart
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
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)
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)
Merge remote-tracking branch 'origin/master' into justin-11-19-14-8-01
Added AJAX-driven Add-to-Cart on Category view

To-do:
+ mini-cart view