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.
[2.2] Ensure float is safely converted to string
Introduced 'woocommerce_find_rates' filter.
Introduced 'woocommerce_ajax_calc_line_taxes' filter.
Merge branch 'master' of github.com:woothemes/woocommerce
remove frontend dashicons, tweak loader
Introduced filter woocommerce_copy_to_theme_folder
Added trim to avoid errors
Introduced woocommerce_delete_from_theme_folder filter
Merge pull request #6892 from SiR-DanieL/patch-2

Introduced filters for copy/delete templates
Allows custom directory for email templates

cc @SiR-DanieL
Add help tip for schedule sales info

Closes #6863
Merge pull request #6893 from bryceadams/patch-6863

Add help tip for schedule sales info
Added missing textdomain

cc @bryceadams #fail
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
Update form-tracking.php
Update form-tracking.php