Fixed chart crediting error
Merge branch 'feature/backend' into develop
Merge branch 'feature/frontend' into develop