new fields template and question count
Merge remote-tracking branch 'origin/master'