templates fixes - made templates list page refreshable
Merge remote-tracking branch 'origin/master'