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'