merge of files TemplateConfiguration and Config
Merge pull request #1 from alfredomx/clean-up

merge of files TemplateConfiguration and Config