Started work on timeline, as well as minor changes to pages
Merge branch 'master' into timeline

Conflicts:
	test/unit/baby_test.rb
	test/unit/event_test.rb
Merge branch 'timeline' into timeline_frontend