Fix barChart bug
Merge branch 'barChart' into develop
Fix score
Merge branch 'layout' into develop
Merge branch 'develop'