More Calendar Updates

This fixes some issues with the last code base push
Merge branch 'master' of https://github.com/secretvolcanolair/reon

Conflicts:
	Pods/Pods.xcodeproj/project.pbxproj
	REON.xcodeproj/project.pbxproj