calendar update
Merge branch 'master' of https://github.com/cschubiner/CS-194-Final-Project

Conflicts:
	iOS/flat/flat/SidebarViewController.m