added calendarEvents list to CanvasApi and CanvasApiImpl
merge
fixed paths in views and HomeConroller