Beefs up cache-key to include end date from request
Merged remote branch with local branch

Conflicts:
	app/controllers/calendars_controller.rb