12/1/2014 5:15 pm
Merge remote-tracking branch 'origin/master'

Conflicts:
	ShoppingSystem/src/shoppingsystem/views/ShoppingCartView.java