Added tooltip for graphs
Fixed merge conflict
Merge branch 'feature/tooltip' into develop