Updated label to new component structure.
Merge branch 'interactiveVisualization' of https://github.com/shilad/macademia into visualization
merging with interactiveVisualization
Merge branch 'interactiveVisualization' of https://github.com/shilad/macademia into visualization

Conflicts:
	Macademia/web-app/js/d3test/label.js
	Macademia/web-app/js/d3test/person-layout.js