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.
changed limit people to go through the controller
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
Limiting the number of people on the controller side
Playing with the friction
Added positions for 1 hub and 2 hubs
changed limit people to go through the controller
Added positions for 1 hub and 2 hubs
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization
Trying to work on transition for different number of hubs
working on transition