Add Calendar Event Features for voyager
Merge with master