Add configuration data
Adding parameters
Merge remote branch 'upstream/master'
Add more parameters and templates
Add some extra packages for home directories and Exec's for cleaning the cache