Incorporated some new fields to EnrollSchedule event model
Added some missing setters
Changed event.type to event.activityType to prefent js issues
Some changes to event rendering to incorporate new fields