add template fields to template and PSTemplate
Merge branch 'master' of github.com:Universum/wetfeet-survey-central