minor
Merge branch 'master' of https://github.com/tgdwyer/WebCola

Conflicts:
	WebCola/WebCola.csproj
	WebCola/examples/3dLayout.js
	WebCola/obj/Debug/WebCola.csprojResolveAssemblyReference.cache