add chart view
fix conflict
Merge branch 'master' of https://github.com/edu-iglesias/HAGI