I've got the Cart page showing in SS3

I just commented out the default Sort rather than trying to force a join
between the OrderModifer and OrderAttribute tables onthe query giving me
grief.
I commented out 2 templates that aren't present yet, RelatedItems and
RecentlyViewedItems
Checkout Shows the Orderform

I can start figuring out Payment gateways now
Account Page is showing PastOrders

Still needs work to pretty it up and show just 1 order
this says I've touched everything but it should just be removing Product_Image
Merge branch 'ss3' of github.com:wildflower/silverstripe-shop into HEAD

Conflicts:
	code/forms/OrderForm.php
	code/model/OrderModifier.php
	code/products/Product.php
	templates/Layout/AccountPage.ss
	templates/Layout/CheckoutPage.ss
	templates/order/Order_Payments.ss

this might be becuase of EProducts?
Update OrderProcessor.php

Set Currency to be from ShopConfig so it's not hardcoded
Update composer.json
Merge remote-tracking branch 'upstream/master' into ss3
this is the first mearge into SS3
Edited the ShopDevelopmentAdmin page with more instructions
Merge remote-tracking branch 'upstream/master' into ss3

Conflicts:
	code/model/OrderModifier.php
	templates/Layout/CheckoutPage.ss
Allow orders to not be sent to admins
Updated templates to use shop module css.
Updated templates to use shop module css.
Fixed ShopPaymentTest, and updated composer requirement to omnipay 1.1
chantes to Account Page
Merge branch 'master' of https://github.com/burnbright/silverstripe-shop into ss3

Conflicts:
	templates/Layout/AccountPage.ss
	templates/Layout/CartPage.ss
Merge branch 'ss3'