tax on varieties: basic model update
tax on varieties: add upgrade SQL
tax on varieties: remove product page type dependent blocks
move product_type block from node/page/product to separate controller
tax on varieties: back office interface upgrade
tax on varieties: remove product_type CSS class from node/page/product
tax on varieties: basket model update
back office sales breakdown report amends
sql upgrade for upcoming changes
update discounts sections (vouchers vs coupons)
update discount code generation to include certain type
basket and invoice breakdown changes + heavy refactoring
Merge branch 'master' of https://github.com/laposa/onxshop

Conflicts:
	docs/UPGRADE-1.5.x-to-1.6.0