not needed spaces timed in smarty tag (cherry picked from commit 09e15c2)
Merge remote-tracking branch 'oxid/b-dev-ce' into composer

Conflicts:
	tests/unit/admin/deliverymainTest.php
Merge branch 'composer' of https://github.com/robinlehrmann/oxideshop_ce into composer