Fix barChart
Merge branch 'layout' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop
Build
Merge branch 'build' into develop
Resolve merge conflicts