graph style improvment
Merge branch 'master' of https://github.com/ucbl/DataConfMashup

Conflicts:
	js/view/ViewAdapter.Graph.js