Merged the changes to template.html
Another merge of template.html