Unit Tests: test_coupons_enabled, test_ship_to_billing_address_only, test_needs_shipping_address
Merge branch 'master' of github.com:woothemes/woocommerce

Conflicts:
	tests/unit-tests/cart.php
Unit Tests: test_coupons_enabled, test_ship_to_billing_address_only, test_needs_shipping_address