Added GeneraList template
Merge branch 'beta'