ShoppingCart done

Updating price on page, creating PurchaseOrder in Payment
Merge branch 'master' of https://github.com/crillesvensson/WebApplikationer

Conflicts:
	Group4Shop_App/src/main/java/dit126/group4/group4shop_app/payment/PaymentService.java
	Group4Shop_App/src/main/webapp/content/checkout/checkout.xhtml