Updating Shipping Address and Shipping Payment Totals

Conflicts:
	html/partials/user.html