Fix column align for discount and total rows
Fix tax details in templates
Fix tax details in invoice templates
Merge branch 'master' into fac24

Conflicts:
	data/fixtures/templates.yml