Attempting to change canvasController into an object
Changing canvasController into an object
Changed CanvasController into an object
Merge branch 'development'