changes from Seb's code review
resolve conflicit in template.php
Merge pull request #298 from Webcraft-Myplanet/uf-460

changes from Seb's code review