CanvasPaint v1.0 beta

Merge. Try the tool here: http://canvaspaint1.appspot.com/