using content type text/html
Merge branch 'staging'