Temp commit.
Merge branch 'master' of https://github.com/matthias-springer/cse135-serverside-web-apps

Conflicts:
	CSE135/WebContent/productOrder.jsp
	CSE135/WebContent/productsBrowsing.jsp