Modified .gitignore
Modified 'index' and 'show' twigs
Added string name parameters to app/config/config.yml
Modified ___Type.php file set
Update .gitignore
Conflicts fixed: config.yml, .gitignore