Merge branch 'master' into timeline
require authentication
Merge branch 'master' of github.com:rcos-babynotes/babynotes
filtering/grouping by day
added measurement happened_at
resolved conflicts
Run migration
Merge branch 'master' into timeline_frontend
Merge branch 'timeline' into timeline_frontend

Conflicts:
	app/controllers/timeline_controller.rb
	app/views/timeline/index.html.erb
	config/routes.rb