Merge branch 'feature/hideChildren'

Conflicts:
	js/impact_graph.js
	stylesheets/impact.css