temporary graph bug fix
Merge branch 'master' of https://github.com/ucbl/DataConfMashup.git

Conflicts:
	js/view/arborGraph.js