merged with master
Merge remote-tracking branch 'origin/visualizationLayouts' into visualizationLayouts

Conflicts:
	Macademia/web-app/js/d3test/interest-viz.js