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

Conflicts:
	js/view/ViewAdapter.Graph.js
	js/view/ViewAdapter.js

Added most viewed keyword and dataPaper modification