integration of chartJS
chart end
Merge branch 'feature/chartJs' into develop
feature/charJs