Calendar is being updated
Merge remote-tracking branch 'jake/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/Ycp_cs320_project_ui.java