Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/openjaf/cenit
Merge branch 'develop'
fixing overview_controller.rb
Merge branch 'master' of https://github.com/openjaf/cenit into feature/data_render
Merge branch 'feature/data_render' of https://github.com/openjaf/cenit into feature/data_render

Conflicts:
	app/controllers/dashboard/overview_controller.rb
Merge branch 'feature/data_render' of https://github.com/openjaf/cenit into feature/data_render
comparing trimesters.Adding Zoom to line chart