Fixed calendars, added new sample calendar to fix referencing issue
Removed unnecessary class files, fixed calendar referencing issues
Fixing up merge