d3treelayout merge
Merge branch 'master' of github.com:Futurescaper/meteor-d3graph

Conflicts:
	.idea/workspace.xml