filters template styles changes
t puMerge branch 'develop' into gh-pages