More work on the days
blah
Merge branch 'master' into timeline
More timeline changes
Merge branch 'timeline' into timeline_frontend
Also add measurements to timeline

Conflicts:
	app/views/timeline/index.html.erb