working on forces
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization

Conflicts:
	Macademia/web-app/js/d3test/person-layout.js
working on forces