fix error of merging
display tax info smaller
Revert "display tax info smaller"

This reverts commit ced9e5ad07f608ab1dea1ebd522a52ce9412f98d.
Merged master fixed conflict.
Merge remote-tracking branch 'origin/dev'
Merge pull request #32 from EU-Legal/dev

Merge Dev to master module 1.0.2
Merge Sync dev => master
Merge branch 'master' of https://github.com/EU-Legal/modules

Conflicts:
	eu_legal/override/controllers/front/ParentOrderController.php
Merge Sync dev => master
Merge pull request #35 from EU-Legal/dev

Merge Dev to master module 1.0.4
Merge pull request #37 from EU-Legal/dev

Merge Dev to master module 1.0.5
Update order-opc.tpl

Breadcrumb didnt show on OnePageCheckout Page.
h2 changed to h1 and css class "page-heading" added.
Update account.html

{cms_legal} was duplicated
Really messed up a href
Merge pull request #39 from panploenes/master

Update order-opc.tpl and emails/de/account.html
=>Breadcrumbs in OPC
=> Messy Code in Mailtemplate