View node
Merge branch 'master' of github.com:jlguenego/webocp

Conflicts:
	client/test/d3/view_node.html