Updating view templates
Merge branch 'master' into TeaPane
Merge branch 'master' into TeaPane
Views updated