4/2/14 - Starting cart/Revisions
11/2/14 - Cart work
Merge origin/master

Conflicts:
	src/java/enterprise/web_jpa_war/entity/ShoppingCartItem.java
	src/java/enterprise/web_jpa_war/servlet/AddToCart.java
	src/java/enterprise/web_jpa_war/servlet/ShoppingCart.java
	web/Services.jsp