changed content type to text/html
Merge branch 'staging'