Refactored basic image on canvas
Refactored basic image on canvas
Merge remote-tracking branch 'origin/master'

Conflicts:
	sandbox/mobile-controller/basic_image_on_canvas.html