More refactoring
Added template file
Merge branch 'master' of https://github.com/y-lohse/LanyonCMS