* better path for the block template
Merge remote-tracking branch 'remotes/origin/master' into feature/oxid-4.5
* correct structure