Fix some bugs:
-  get_shipping_address now takes the basket in parameter
- get_shipping_method takes the shipping_address
Adjustments to deal with django oscar 0.6
Remove template modification comming from another branch