Removed 'apply before tax' options for coupons - this should be the default core behaviour
Remove 'order' discounts from classes
Store discount 'tax' to show discounts on prices including tax more accuratly

Also deprecated some functions named after having 2 levels of discounts.
Merge branch 'tax-coupon-handling' Closes #6830

Conflicts:
	assets/js/admin/meta-boxes-order.min.js
	includes/api/class-wc-api-coupons.php
	includes/class-wc-cart.php
	templates/checkout/review-order.php
Merge branch 'master' of https://github.com/woothemes/woocommerce