commit to pull
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization

Conflicts:
	Macademia/web-app/js/d3test/main-viz.js
commit to pull
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization

Conflicts:
	Macademia/web-app/js/d3test/main-viz.js
commit to pull
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization

Conflicts:
	Macademia/web-app/js/d3test/interest-viz.js
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization
The hash only requires the nodeId now. Other variables can be created on the fly.