ChartController
Merge branch 'ChartController'