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

Conflicts:

	CanvasRender/Application/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CanvasRender/Application/src/index.html