bugfixes for templateInfo
Merge branch 'Dev-Nightly' of https://github.com/danielgruber/Goma-CMS into Dev-Nightly