Added calendar event thing
Merge branch 'master' of https://github.com/team-cocoa-pebbles/ios-app

Conflicts:
	Kiwi/Kiwi.xcodeproj/project.pbxproj
Additional merging.