...
Merge branch 'master' of https://github.com/CoffeeJs/CoffeeJs

Conflicts:
	CanvasRender/CanvasRender.v12.suo