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

fix merge artifact
Merge remote-tracking branch 'zimk/master' into feature/modal-improvements