Fixed templates#2

Open

gamerson wants to merge 2 commits intotesla:masterfrom

gamerson:master

Commits on Dec 18, 2014

remove trailing whitespace
gamerson
committed

Commits on Dec 22, 2014

added missing template processing
gamerson
committed