DRYed out calendar entries controllers
Merge branch 'JR_sandbox_creating_child_calendar_view' of github.com:johntrandall/ourday into JR_sandbox_creating_child_calendar_view

Conflicts:
	app/controllers/appointments_controller.rb