fix merge artifact from previous https://github.com/ZIMK/fwadmin/pull/22/files (bad git!)
Merge branch 'hotfix/fix-template-merge-artifact'