shit happens
Merge remote-tracking branch 'origin/master'

Conflicts:
	CanvasEngineV_0.02.sdf
	CanvasEngineV_0.02.v11.suo