Merge pull request #301 from Webcraft-Myplanet/uf-462

Uf 462
edited template
added back some deleted lines from template
Merge pull request #302 from Webcraft-Myplanet/uf-461

Uf 461
fixed merge conflicts