Merge branches 'visualizationHub' and 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts

Conflicts:
	Macademia/grails-app/views/d3/hub.gsp