Implemented CalendarInstance Class
Implemented CollisionDetector Class
Merge branches 'calendar' and 'master' of https://github.com/fldpi/SoberApp into calendar