Merge branch 'master' of https://github.com/mazong1123/fabric.ext.git

Conflicts:
	fabricext/fabricext.csproj
	fabricext/scripts/fabric.canvasex.js