merged with latest develop
Merge branch 'D1545' of github.com:loadedcommerce/loaded7 into D1545

Conflicts:
	catalog/admin/includes/applications/statistics/js/statistics.js.php
	catalog/admin/includes/applications/statistics/pages/main.php
	catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php
	catalog/admin/includes/modules/statistics/customer_orders.php
	catalog/admin/includes/modules/statistics/inventory_cost_margin.php
	catalog/admin/includes/modules/statistics/margin_report_sales.php
	catalog/admin/includes/modules/statistics/sales_report.php
	catalog/admin/includes/modules/statistics/sales_tax_report.php
	catalog/admin/templates/default/css/style.css
Merge remote-tracking branch 'remotes/origin/D1545' into develop

Conflicts:
	catalog/admin/includes/applications/statistics/js/statistics.js.php
	catalog/admin/includes/applications/statistics/pages/main.php
	catalog/admin/includes/modules/statistics/sales_tax_report.php
	catalog/admin/templates/default/css/style.css