Fixed CanvasWidget missing joint 4 x and y slots
Fixing merge issues