Merge branch 'Milestone-3' into 48-implement-mvc-for-event-eventcomment-eventparticipant