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