Fixes #1152 Add Template Group in Global Templates
Merge pull request #1157 from Sama34/fix-1152

Fixes #1152 Add Template Group in Global Templates