events loading now reflects JSON format changes
Merge branch 'master' into Ebby

Conflicts:
	FIU CIS Events
Calendar.xcodeproj/project.xcworkspace/xcuserdata/ebbichan.xcuserdatad/U
serInterfaceState.xcuserstate
deleted calendar image
Merge branch 'master' into Ebby
changes to eventDate parsing
Merge pull request #7 from ebbyw/Ebby

Ebby