Edit conflicts

Done:
* Header: Non-JS
* Header: JS
* Title: Non-JS
* Title: JS
* Post: Non-JS
* Post: JS

Note: there's some duplication of tipsy code. Not sure how I feel about that.

Change-Id: I70fc7384eb0fb9929db0ad478dc624a22f7fe6a5
Merge "Edit conflicts"