todo
Merge branch 'katalog-1.5' of github.com:TheGiftsProject/katalog into katalog-1.5