added CanvasItem class
Merge branch 'develop' into canvas-item
disabled CanvasItem