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
added paypal in list of supported payment modules
fixed block of licence
Merge pull request #36 from BluTiGeS/dev
Update README.md
Update payment modules to newest version

bankwire       1.0.1
cashondelivery 0.7.3
cheque         2.5
hipay
1.6.6
moneybookers   1.6.8
ogone          2.10
paypal
3.7.2
sofortbanking  2.5.1
new module version 1.0.5
Merge pull request #37 from EU-Legal/dev

Merge Dev to master module 1.0.5