committing changes to timeline so that nobelist demo displays right
Merge branch 'refs/heads/timeline'

Conflicts:
	scripted/demos/nobelists/nobelists.html