fixed associations for calendar entries
Merge branch 'JR_sandbox_creating_child_calendar_view' of github.com:johntrandall/ourday into JR_sandbox_creating_child_calendar_view

Conflicts:
	admin/working_folder_John/Architecture Documents.graffle