Worked cart functionality; items display in cart
Merge remote-tracking branch 'origin/jspdev' into modeldev

Conflicts:
	eFood1/WebContent/cart.jspx
Add cart money values like total, tax, shipping
Add free shipping behaviour
Added remove item and update items functionality to cart jsp
Merge remote branch 'origin/modeldev' into jspdev

Conflicts:
	eFood1/WebContent/META-INF/context.xml
	eFood1/src/model/bean/ItemBean.java
	eFood1/src/model/dao/ItemDAO.java
super mega ultimate changes by ethan