Merge conflict with popup.html
Add index template.